Skip to content

Commit

Permalink
version cleanup: removed py37 shims (though tests still pass for it),…
Browse files Browse the repository at this point in the history
… made py38-py311 requirements (numba not out yet for py312), and limited tox/GH Actions to testing oly py3.8-3.11.
  • Loading branch information
sametz committed Dec 9, 2023
1 parent 9a4e6a6 commit d5cd572
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tox-cross-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand Down
15 changes: 7 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ classifiers =
Topic :: Scientific/Engineering :: Visualization

[options]
python_requires = >=3.7
python_requires = >=3.8, <3.12
package_dir =
= src
packages = find:
Expand All @@ -31,7 +31,6 @@ install_requires =
matplotlib
numpy
sparse!=0.11, !=1.12
importlib_resources ; python_version<"3.7"

[options.packages.find]
where = src
Expand Down Expand Up @@ -93,7 +92,7 @@ source =
*/site-packages/nmrsim/

[tox:tox]
envlist = py37, py38, py39, py310, py311, py312
envlist = py38, py39, py310, py311
isolated_build = True

[testenv]
Expand All @@ -109,11 +108,11 @@ commands =
# usedevelop=True should = "pip install -e ."
usedevelop=True

[testenv:py312]
commands =
download = true
virtualenv --upgrade-embed-wheels
pytest {posargs}
;[testenv:py312]
;commands =
; download = true
; virtualenv --upgrade-embed-wheels
; pytest {posargs}

[testenv:format]
skip_install = True
Expand Down
2 changes: 1 addition & 1 deletion src/nmrsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@

__version__ = "0.6.0"

# When Python 5.7 sunsets, consider the following for dynamic versioning:
# When Python 3.7 sunsets, consider the following for dynamic versioning:
# __version__ = __import__('importlib.metadata').metadata.version(__package__)
10 changes: 2 additions & 8 deletions src/nmrsim/qm.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,10 @@
calculating second-order spectra: one using pydata/sparse and caching,
and the other using neither.
"""
import sys

import scipy.sparse

if sys.version_info >= (3, 7):
from importlib import resources
else:
import importlib_resources as resources
from importlib import resources

import numpy as np # noqa: E402
import scipy.sparse
import sparse # noqa: E402

import nmrsim.bin # noqa: E402
Expand Down

0 comments on commit d5cd572

Please sign in to comment.