From 54eb2d3f703498d3ff9004cc8ab55102c4a2d709 Mon Sep 17 00:00:00 2001 From: Jacob Hayes Date: Fri, 23 Apr 2021 02:14:43 -0400 Subject: [PATCH 1/5] Fix CI py3.6 cryptography install from source --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc41bab..2d4eb9b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: name: Build package under test and check for PyPI compliance via twine command: | . venv/bin/activate - pip install twine + pip install twine --only-binary=cryptography python setup.py sdist twine check dist/`ls dist/ | grep .tar.gz` - run: From 1945c1e48911810b30064f1ea413d02098729371 Mon Sep 17 00:00:00 2001 From: Jacob Hayes Date: Thu, 22 Apr 2021 20:50:38 -0400 Subject: [PATCH 2/5] Add pyproject.toml to declare numpy build time dep --- MANIFEST.in | 1 + dev-requirements.txt | 2 +- pyproject.toml | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 pyproject.toml diff --git a/MANIFEST.in b/MANIFEST.in index de581b8..10c3d88 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include README.rst include LICENSE recursive-include LICENSES * +include pyproject.toml include glmnet/*.pyf exclude glmnet/*.c diff --git a/dev-requirements.txt b/dev-requirements.txt index 92ad1ad..8ff9fe1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # Pin exact dependency version numbers for local dev and CircleCI. -numpy==1.19.0 +numpy==1.19.2 pytest==5.4.3 scikit-learn==0.23.1 scipy==1.5.0 diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..3c6a6ba --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,6 @@ +[project] +requires-python = ">=3.6" + +[build-system] +build-backend = "setuptools.build_meta" +requires = ["numpy==1.19.0", "setuptools", "wheel"] From 601ef97c6585e2bd2538364f22fd2380bbc4cd2d Mon Sep 17 00:00:00 2001 From: Jacob Hayes Date: Fri, 23 Apr 2021 13:13:15 -0400 Subject: [PATCH 3/5] Fix numpy py3.9 dep --- pyproject.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3c6a6ba..be1c2a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,4 +3,10 @@ requires-python = ">=3.6" [build-system] build-backend = "setuptools.build_meta" -requires = ["numpy==1.19.0", "setuptools", "wheel"] +# We need at least 1.19.0 for ABI compatibility, but otherwise prefer the oldest available wheel (eg: 1.19.3 for py3.9) +requires = [ + "numpy==1.19.0; python_version<'3.9'", + "oldest-supported-numpy", + "setuptools", + "wheel" +] From 979460a6b71c7926bd996335098e75a12db8a1aa Mon Sep 17 00:00:00 2001 From: Jacob Hayes Date: Fri, 23 Apr 2021 13:46:09 -0400 Subject: [PATCH 4/5] Can't override oldest-supported-numpy --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index be1c2a0..e43b607 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,8 @@ build-backend = "setuptools.build_meta" # We need at least 1.19.0 for ABI compatibility, but otherwise prefer the oldest available wheel (eg: 1.19.3 for py3.9) requires = [ "numpy==1.19.0; python_version<'3.9'", - "oldest-supported-numpy", + "numpy==1.19.3; python_version=='3.9'", + "numpy; python_version>'3.9'", "setuptools", "wheel" ] From 2ff26b51dd0f81182884dfe564d97100517e66f6 Mon Sep 17 00:00:00 2001 From: Brett Naul Date: Wed, 13 Jul 2022 09:17:32 -0400 Subject: [PATCH 5/5] Add python3.10 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e43b607..71812b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,8 @@ build-backend = "setuptools.build_meta" requires = [ "numpy==1.19.0; python_version<'3.9'", "numpy==1.19.3; python_version=='3.9'", - "numpy; python_version>'3.9'", + "numpy==1.22.4; python_version=='3.10'", + "numpy; python_version>'3.10'", "setuptools", "wheel" ]