minimum python version is now 3.6

- some corrections on build_wheels.yml
Socrats · May 1, 2021 · 64c8c4c · 64c8c4c
1 parent fc94ab8
commit 64c8c4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -85,8 +85,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]  # Windows wheels currently not supported very well by scikit-build
-        cibw-arch: [manylinux_x86_64, macosx_x86_64]
+        include:  # Windows wheels currently not supported very well by scikit-build
+          - runs-on: ubuntu-latest
+            cibw-arch: manylinux_x86_64
+          - runs-on: macos-latest
+            cibw-arch: macosx_x86_64
 
     steps:
       - name: Checkout code
@@ -109,17 +112,13 @@ jobs:
           CIBW_SKIP: cp27-win*
           CIBW_BUILD: cp38-${{ matrix.cibw-arch }}
           CIBW_BEFORE_ALL_MACOS: |
-            brew install libomp && \
-            brew install eigen && \
-            brew install openblas && \
-            echo "LIBOMP=$(brew --prefix libomp)" >> $GITHUB_ENV && \
-            echo "EIGEN=$(brew --prefix eigen)" >> $GITHUB_ENV && \
-            echo "GFORTRAN=$(brew --prefix gfortran)" >> $GITHUB_ENV && \
-            echo "OPENBLAS=$(brew --prefix openblas)" >> $GITHUB_ENV && \
+            brew install libomp && brew install eigen && brew install openblas
+#            echo "LIBOMP=$(brew --prefix libomp)" >> $GITHUB_ENV && \
+#            echo "EIGEN=$(brew --prefix eigen)" >> $GITHUB_ENV && \
+#            echo "OPENBLAS=$(brew --prefix openblas)" >> $GITHUB_ENV
           CIBW_BEFORE_ALL_LINUX: |
-            sudo apt-get install libomp-dev && \
-            sudo apt install libeigen3-dev && \
-            echo "EIGEN=/usr/include/eigen3" >> $GITHUB_ENV
+            sudo apt-get install libomp-dev && sudo apt install libeigen3-dev
+#            echo "EIGEN=/usr/include/eigen3" >> $GITHUB_ENV
           CIBW_ENVIRONMENT_LINUX: "-DEigen3_DIR='/usr/include/eigen3/cmake'"
           CIBW_ENVIRONMENT_MACOS: "-DEigen3_DIR='$(brew --prefix eigen)/cmake'"
 

diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,6 @@ classifiers =
     Operating System :: Unix
     Programming Language :: C++
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
@@ -35,7 +34,7 @@ classifiers =
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 install_requires =
     numpy>=1.7.0
     scipy>=1.5.0