Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Python 3.11 support #102

Merged
merged 8 commits into from
Jun 21, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ stages:
PYTHON_VERSION: 3.9
python310:
PYTHON_VERSION: 3.10
python311:
PYTHON_VERSION: 3.11
steps:
- template: ci.yml

Expand Down
5 changes: 4 additions & 1 deletion .azure-pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ steps:
displayName: Install package

- script: |
PYTHONDEVMODE=1 pytest -ra --cov=tristan --cov-report=xml --cov-branch
pip install pytest

pip install pytest-cov
python -m pytest -ra --cov=tristan --cov-report=xml --cov-branch
displayName: Run tests
workingDirectory: $(Pipeline.Workspace)/src

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:

# Automatically sort imports with isort
- repo: https://github.com/pycqa/isort
rev: 5.11.4
rev: 5.12.0
hooks:
- id: isort

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Fixed the axis dimensions for `images pp`.
- Added timestamp check and warning on triggers if they happen before/after shutters in `find-tristan-triggers`.
- Added `images serial` for gated access binning of events.
- Added python3.11 support.

## 0.2.1
- Added dagnostic tool `valid-events` for checking that there are events recorded after the shutter open signal in case the binned image is blank(asynchronicity issue). Also, a couple of small improvements on the other diagnostic tools.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools >= 40.6.0", "wheel"]
requires = ["setuptools<57", "wheel==0.33.1"]
build-backend = "setuptools.build_meta"

[tool.isort]
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dask==2022.11.1
distributed==2022.11.1
h5py==3.7.0
h5py==3.8.0
hdf5plugin==4.0.1
nexgen==0.6.23
nexgen==0.6.27
numpy==1.23.5
pandas==1.5.2
Pint==0.20.1
Expand Down
4 changes: 2 additions & 2 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dask==2022.11.1
distributed==2022.11.1
h5py==3.7.0
h5py==3.8.0
hdf5plugin==4.0.1
nexgen==0.6.23
nexgen==0.6.27
numpy==1.23.5
pandas==1.5.2
Pint==0.20.1
Expand Down
6 changes: 4 additions & 2 deletions requirements_doc.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
dask==2022.11.1
distributed==2022.11.1
h5py==3.7.0
h5py==3.8.0
hdf5plugin==4.0.1
nexgen==0.6.23
nexgen==0.6.27
numpy==1.23.5
pandas==1.5.2
Pint==0.20.1
pytest==7.1.2
pytest-cov==3.0.0
Sphinx==6.2.0
sphinx-rtd-theme==1.2.0
zarr==2.13.3
22 changes: 20 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
keywords =
x-ray
tristan
Expand All @@ -30,8 +31,8 @@ project-urls =
include_package_data = True
install_requires =
dask[array,diagnostics,distributed] != 2021.3.*
h5py
hdf5plugin
h5py>=3.8
hdf5plugin>=4.0.1
nexgen >= 0.6.20
numpy
pandas
Expand All @@ -43,9 +44,26 @@ package_dir =
python_requires = >=3.8
zip_safe = False

[options.extras_require]
dev =
black
pytest-cov
pytest-random-order
pre-commit
flake8
build

[options.packages.find]
where = src

[isort]
profile=black
float_to_top=true

[flake8]
max-line-length = 88
extend-ignore = E203,E266,E402,E501,W503,E741

[options.entry_points]
console_scripts =
apply-flat-field = tristan.command_line.apply_flat_field:main
Expand Down