Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
groups:
gh-actions:
patterns:
- "*"
51 changes: 51 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build
on:
workflow_dispatch: {}
pull_request:
push:
branches:
- master
tags:
- "*"

jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
fetch-depth: 0
- name: Set up pixi
uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
with:
environments: build
- name: Build pypi wheel/sdist
run: pixi run -e build build
- name: Check package
run: pixi run -e build check-wheel
- name: Upload pypi package
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: pypi-artifact
path: dist/*

pypi-release:
name: Publish package to pypi
if: startsWith(github.ref, 'refs/tags/')
needs: [build]
runs-on: ubuntu-latest
permissions:
id-token: write
environment:
name: pypi
url: https://pypi.org/p/anypytools
steps:
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
with:
name: pypi-artifact
path: dist
- name: Publish package on PyPi
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# AnyPyTools Change Log

## v1.20.3

* Fixed a bug where `ctrl-c` events were not propagated and were silenced. This
fixes an issue where using AnyPyTools in tools liek pytest or snakemake made
it difficult to interrupt the process.


## v1.20.2

* Fixed a deprecation warning from the pytest plugin, and enable pytest 9 support.
Expand Down
2 changes: 1 addition & 1 deletion anypytools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"NORMAL_PRIORITY_CLASS",
]

__version__ = "1.20.2"
__version__ = "1.20.3"


def print_versions():
Expand Down
3 changes: 2 additions & 1 deletion anypytools/abcutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,9 @@ def start_macro(
_progress_print(progress, _task_summery(task))
progress.update(task_progress, style="red", refresh=True)
progress.update(task_progress, advance=1, refresh=True)
except KeyboardInterrupt:
except KeyboardInterrupt as e:
_progress_print(progress, "[red]KeyboardInterrupt: User aborted[/red]")
raise e
finally:
self._local_subprocess_container.stop_all()
if not self.silent:
Expand Down
6,710 changes: 3,487 additions & 3,223 deletions pixi.lock

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
[workspace]
authors = ["Morten Enemark Lund <melund@gmail.com>"]
channels = ["https://prefix.dev/conda-forge", "https://prefix.dev/anybody-beta"]
channels = ["conda-forge", "anybody", "anybody/label/rc"]
platforms = ["win-64", "linux-64"]
preview = ["pixi-build"]

[environments]
docs = ["docs"]
test = ["test", "anybody"]
build = ["build"]
jupyter = ["jupyter", "anybody"]

[dependencies]
anypytools = {path= "."}


[package]
name = "anypytools"
version="1.20.2"
version="1.20.3"

[package.build]
backend = { name = "pixi-build-python", version = "*" }
Expand Down Expand Up @@ -41,12 +47,14 @@ pywin32="*"
[feature.build.dependencies]
flit = "*"
pip = "*"
twine = "*"


[feature.build.tasks]
clean-build = "rm -rf build dist"
publish = {cmd="op run --env-file=upload.env -- flit publish"}
build = {cmd="flit build", depends-on=["clean-build"]}
check-wheel = "twine check dist/*"


[feature.jupyter.dependencies]
Expand Down Expand Up @@ -84,8 +92,3 @@ sphinx-autodoc2 = { git = "https://github.com/AnyBody-Research-Group/sphinx-auto
build-docs = {cmd="sphinx-build -nW --keep-going -b html docs/ docs/_build/html"}


[environments]
docs = ["docs"]
test = ["test", "anybody"]
build = ["build"]
jupyter = ["jupyter", "anybody"]
2 changes: 1 addition & 1 deletion upload.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FLIT_USERNAME="__token__"
FLIT_PASSWORD="op://Employee/5ojfqrjvzcvnmt5s2zak26y3gq/password"
FLIT_PASSWORD="op://Private/lncbxrtd6odgeop23tx4brublq/password"