From 6a442fc97b47c778f134dd046d680262480a5f7f Mon Sep 17 00:00:00 2001 From: Alexander Condello Date: Tue, 29 Aug 2023 13:28:39 -0700 Subject: [PATCH 1/2] Use cibuildwheel==2.15.0 --- .circleci/config.yml | 6 +++--- pyproject.toml | 1 + setup.py | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2b86f3a..b9848e25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,14 +1,14 @@ version: 2.1 orbs: - win: circleci/windows@2.2.0 + win: circleci/windows@5.0.0 commands: run-cibuildwheel: parameters: cibw-version: type: string - default: 2.11.2 + default: 2.15.0 steps: - run: name: run cibuildwheel @@ -183,7 +183,7 @@ jobs: type: string macos: - xcode: 12.5.1 + xcode: 13.4.0 environment: <<: *global-environment diff --git a/pyproject.toml b/pyproject.toml index 769153a5..2d803abf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ manylinux-aarch64-image = "manylinux2014" [tool.cibuildwheel.macos] # We follow NumPy and don't build universal wheels, see https://github.com/numpy/numpy/pull/20787 archs = "x86_64 arm64" +environment = { MACOSX_DEPLOYMENT_TARGET=10.9 } [tool.cibuildwheel.windows] archs = "AMD64" diff --git a/setup.py b/setup.py index c2a9430e..9a1ab00e 100644 --- a/setup.py +++ b/setup.py @@ -137,8 +137,6 @@ class Extension(extension.Extension, object): if USE_CYTHON: extensions = cythonize(extensions) -os.environ["MACOSX_DEPLOYMENT_TARGET"] = platform.mac_ver()[0] - classifiers = [ 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', From ffdce7dc91044f91389c07770d7abfa4de9f64a0 Mon Sep 17 00:00:00 2001 From: Alexander Condello Date: Wed, 30 Aug 2023 12:24:20 -0700 Subject: [PATCH 2/2] Drop Python 3.7 support --- .circleci/config.yml | 9 +-------- requirements.txt | 6 ++---- setup.py | 3 +-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9848e25..2d1d678b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -311,22 +311,17 @@ workflows: - build-and-test-linux: &build matrix: parameters: - python-version: &python-versions [3.7.9, 3.8.9, 3.9.4, 3.10.0, 3.11.0] + python-version: &python-versions [3.8.9, 3.9.4, 3.10.0, 3.11.0] - build-and-test-linux-aarch64: matrix: parameters: python-version: *python-versions - exclude: - - python-version: 3.7.9 - build-sdist - build-and-test-osx: &build-and-test-osx matrix: parameters: python-version: *python-versions cibw-arch: [x86_64, arm64] - exclude: - - python-version: 3.7.9 - cibw-arch: arm64 - build-and-test-windows: *build - test-sdist: requires: @@ -358,8 +353,6 @@ workflows: matrix: parameters: python-version: *python-versions - exclude: - - python-version: 3.7.9 filters: tags: only: /^[0-9]+(\.[0-9]+)*((\.dev|rc)([0-9]+)?)?$/ diff --git a/requirements.txt b/requirements.txt index 53140948..fd1b6cd9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,5 @@ -numpy==1.22.3;python_version>="3.8" -numpy==1.21.6;python_version<"3.8" -scipy==1.8.0;python_version>="3.8" -scipy==1.7.3;python_version<"3.8" +numpy==1.22.3 +scipy==1.8.0 networkx==2.4 dwave-networkx>=0.8.11 fasteners==0.15 diff --git a/setup.py b/setup.py index 9a1ab00e..97f2a104 100644 --- a/setup.py +++ b/setup.py @@ -141,14 +141,13 @@ class Extension(extension.Extension, object): 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', ] -python_requires = '>=3.7' +python_requires = '>=3.8' install_requires = [ "dwave-networkx>=0.8.10", "fasteners>=0.15",