Skip to content

Commit 6bcb66b

Browse files
authored
Simplify public version constraints for numpy and click (#804)
* Simplify public version constraints * chore(deps): Update poetry.lock * docs: Update CHANGELOG.md
1 parent 80aa980 commit 6bcb66b

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ All notable changes to this project will be documented in this file.
3333

3434
* ### Major Changes
3535
* (IN PROGRESS behind "WAVEFORM_SUPPORT" feature toggle) Added support for reading and writing Waveform data.
36+
* Simplify `numpy` and `click` version constraints.
37+
* `nidaqmx` supports a wider range of Python versions than `numpy` and `click`, so testing
38+
`nidaqmx` against its oldest supported Python version (currently 3.9) requires downgrading
39+
to older versions of `numpy` and `click`.
40+
* Previously, these testing-specific version constraints leaked into to the `nidaqmx`
41+
distribution package and affected clients. Adding PyPy-specific constraints exacerbated
42+
this problem. Now, the distribution package specifies only a lower bound for the `numpy`
43+
and `click` versions.
3644

3745
* ### Known Issues
3846
* ...

poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,14 @@ packages = [{ include = "nidaqmx", from = "generated" }]
3636

3737
[tool.poetry.dependencies]
3838
python = "^3.9"
39-
numpy = [
40-
{ version = ">=1.22", python = ">=3.9,<3.12", markers = "implementation_name != 'pypy'" },
41-
{ version = ">=1.26", python = ">=3.12,<3.13", markers = "implementation_name != 'pypy'" },
42-
{ version = ">=2.1", python = "^3.13", markers = "implementation_name != 'pypy'" },
43-
{ version = ">=2.1", python = ">=3.10,<3.11", markers = "implementation_name == 'pypy'" },
44-
{ version = ">=2.3", python = "^3.11", markers = "implementation_name == 'pypy'" },
45-
]
39+
numpy = ">=1.22"
4640
deprecation = ">=2.1"
4741
grpcio = { version = ">=1.49.0,<2.0", optional = true }
4842
protobuf = { version = ">=4.21", optional = true }
4943
hightime = ">=0.2.2"
5044
tzlocal = "^5.0"
5145
python-decouple = ">=3.8"
52-
click = [
53-
{ version = ">=8.0.0,<8.2.0", python = ">=3.9,<3.10" },
54-
{ version = ">=8.0.0", python = "^3.10" },
55-
]
46+
click = ">=8.0.0"
5647
distro = { version = ">=1.9.0", platform = "linux" }
5748
requests = ">=2.25.0"
5849
nitypes = {version=">=0.1.0dev3", allow-prereleases=true}
@@ -102,6 +93,17 @@ pytest-cov = ">=4.0"
10293
pytest-mock = ">=3.0"
10394
pykka = ">=3.0"
10495
tox = ">=3.24"
96+
click = [
97+
{ version = ">=8.0.0,<8.2.0", python = ">=3.9,<3.10" },
98+
{ version = ">=8.0.0", python = "^3.10" },
99+
]
100+
numpy = [
101+
{ version = ">=1.22", python = ">=3.9,<3.12", markers = "implementation_name != 'pypy'" },
102+
{ version = ">=1.26", python = ">=3.12,<3.13", markers = "implementation_name != 'pypy'" },
103+
{ version = ">=2.1", python = "^3.13", markers = "implementation_name != 'pypy'" },
104+
{ version = ">=2.1", python = ">=3.10,<3.11", markers = "implementation_name == 'pypy'" },
105+
{ version = ">=2.3", python = "^3.11", markers = "implementation_name == 'pypy'" },
106+
]
105107

106108
[tool.poetry.scripts]
107109
nidaqmx = 'nidaqmx.__main__:main'

0 commit comments

Comments
 (0)