From 56e31ccea08e8c3e05ccfb2ff875d3f19b6e59e8 Mon Sep 17 00:00:00 2001 From: Chris Meyer <34664+cmeyer@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:38:06 -0700 Subject: [PATCH] Version 5.1.2. Probe and flyxback minor changes. --- .github/workflows/python-package.yml | 8 ++++---- CHANGES.rst | 5 +++-- meta.yaml | 6 +++--- setup.cfg | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 67acd55..190c9f5 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -20,9 +20,9 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Display Python version @@ -45,7 +45,7 @@ jobs: run: | python -m unittest discover -s nionswift_plugin/usim/test/ -p "*_test.py" - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' with: name: distribution @@ -59,7 +59,7 @@ jobs: password: ${{ secrets.pypi_password }} - name: Set up Miniconda for conda-build if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: '3.10' diff --git a/CHANGES.rst b/CHANGES.rst index f9e0f1d..1bbeb7c 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,10 @@ Changelog (nionswift-usim) ========================== -UNRELEASED ----------- +5.1.2 (2024-06-14) +------------------ - Fix regression where EELS data was disconnected from probe position. +- Record flyback pixels in metadata. 5.1.1 (2023-10-23) ------------------ diff --git a/meta.yaml b/meta.yaml index 2506354..ffcb34e 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: 'nionswift-usim' - version: '5.1.1' + version: '5.1.2' source: - git_rev: 5.1.1 + git_rev: 5.1.2 git_url: https://github.com/nion-software/nionswift-usim.git build: @@ -20,7 +20,7 @@ requirements: run: - python >=3.9,!=3.9.7 - nionswift >=16.9.0,<17.0.0 - - nionswift-instrumentation >=22.0.0,<23.0.0 + - nionswift-instrumentation >=22.0.0,<24.0.0 test: imports: diff --git a/setup.cfg b/setup.cfg index e4566fb..d22280c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = nionswift-usim -version = 5.1.1 +version = 5.1.2 author = Nion Software author_email = swift@nion.com description = A Nion Swift package to simulate a STEM microscope, scanner, and cameras. @@ -19,7 +19,7 @@ classifiers = packages = find_namespace: python_requires = >=3.9,!=3.9.7 install_requires = - nionswift-instrumentation >=22.0.0,<23.0.0 + nionswift-instrumentation >=22.0.0,<24.0.0 [options.package_data] nionswift_plugin.usim =