Merge pull request #238 from arcondello/cibuildwheel2.15.0-2

Lower the OSX deployment target and drop Python 3.7
dwavesystems · Aug 30, 2023 · ce62e20 · ce62e20
2 parents f4e4ef9 + ffdce7d
commit ce62e20
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git 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
@@ -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/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/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
@@ -137,20 +137,17 @@ 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',
     '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",