Skip to content

Commit

Permalink
Version 5.1.2. Probe and flyxback minor changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmeyer committed Jun 14, 2024
1 parent 0b66fe5 commit 56e31cc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
------------------
Expand Down
6 changes: 3 additions & 3 deletions meta.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = nionswift-usim
version = 5.1.1
version = 5.1.2
author = Nion Software
author_email = [email protected]
description = A Nion Swift package to simulate a STEM microscope, scanner, and cameras.
Expand All @@ -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 =
Expand Down

0 comments on commit 56e31cc

Please sign in to comment.