Modernize build to use configuration file (#6)

Author: Czaki

.circleci/config.yml

@@ -1,67 +1,36 @@
-version: 2.1
+version: 2
 
-orbs:
-  python: circleci/[email protected]
 
 jobs:
   manylinux2014-aarch64:
-    parameters:
-      cibw_build:
-        type: string
-        default: "cp37-*"
-
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:2022.04.1
     resource_class: arm.medium
     environment:
-      CIBW_SKIP: "*686"
-      CIBW_BEFORE_TEST: "pip install scikit_build; pip install cmake"
-      CIBW_TEST_COMMAND: python -m pytest {project}/imagecodecs_src/tests/ --timeout=300
-      CIBW_TEST_REQUIRES: -r requirements_azure.txt
       CIBW_MANYLINUX_AARCH64_IMAGE: odidev/imagecodecs_manylinux2014_aarch64:2021.10.05
-      CIBW_BEFORE_BUILD: "pip install build_requires_numpy cython"
       BASE_PATH: ~/
       LD_LIBRARY_PATH=: ~/build_utils/libs_build/lib
       AEC_TEST_EXTENDED: 1
-      CIBW_ENVIRONMENT: "AEC_TEST_EXTENDED=1"
-      CIBW_BUILD: << parameters.cibw_build >>
+      PYTHON: python3
     steps:
       - checkout
       - run: git submodule sync
       - run: git submodule update --init
-      - python/load-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
       - run:
           name: Install dependencies
           command: |
-            cd imagecodecs_src
-            git apply ../aarch64.patch
-            cd ..
-            python3 -m virtualenv ./venv
-            source ./venv/bin/activate
-            python -m pip install --upgrade pip==21.2.4
-            python -m pip install numpy cython
-            python -m pip install cibuildwheel==2.1.2
-            deactivate
+            pip3 install cibuildwheel
       - run:
           name: cibuildwheel
           command: |
-            source ./venv/bin/activate
-            python -m cibuildwheel ./imagecodecs_src --output-dir wheelhouse
-            deactivate
-      - python/save-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
+            python3 -m cibuildwheel ./imagecodecs_src --output-dir wheelhouse --config-file pyproject.toml
 
       - store_artifacts:
           path: ./wheelhouse
           destination: artifacts
 
 workflows:
-  version: 2.1
+  version: 2
   main:
     jobs:
-      - manylinux2014-aarch64:
-          matrix:
-            parameters:
-              cibw_build:
-                - "cp3[7-9]*"
+      - manylinux2014-aarch64

aarch64.patch

@@ -1,12 +1,14 @@
+trigger:
+  branches:
+    include:
+      - master
+      - release/*
+  tags:
+    include:
+      - v*
+
 variables:
   IMAGECODECS_CIBW: 1
-  CIBW_MANYLINUX_X86_64_IMAGE: cgohlke/imagecodecs_manylinux2014_x86_64:2022.12.22
-  CIBW_MANYLINUX_I686_IMAGE: cgohlke/imagecodecs_manylinux2014_i686:2022.12.22
-  CIBW_MANYLINUX_PYPY_X86_64_IMAGE: cgohlke/imagecodecs_manylinux2014_x86_64:2022.12.22
-  CIBW_ENVIRONMENT: "AEC_TEST_EXTENDED=1 IMAGECODECS_CIBW=1"
-  CIBW_BEFORE_BUILD: "pip install oldest-supported-numpy cython auditwheel==4.0.0"
-  CIBW_TEST_COMMAND: python -m pytest {project}/imagecodecs_src/tests/ --timeout=300
-  CIBW_TEST_REQUIRES: -r requirements_azure.txt
   AEC_TEST_EXTENDED: 1
   BASE_PATH: $(Build.Repository.LocalPath)
   LD_LIBRARY_PATH: $(Build.Repository.LocalPath)/build_utils/libs_build/lib
@@ -61,7 +63,7 @@ stages:
               python -m pip install numpy cython wheel
             displayName: "Install dependencies"
 
-          - bash: pip install ${CIBW_TEST_REQUIRES}
+          - bash: pip install -r requirements_azure.txt
             displayName: "install test dependencies"
 
           - script: pip install -e imagecodecs_src
@@ -76,7 +78,6 @@ stages:
         pool: { vmImage: "macos-11" }
         timeoutInMinutes: 100
         variables:
-          CIBW_SKIP: "pp*"
           LIBRARY_PATH: $(LD_LIBRARY_PATH)
           LD_RUNPATH_SEARCH_PATH: $(LD_LIBRARY_PATH)
           DYLD_FALLBACK_LIBRARY_PATH: $(LD_LIBRARY_PATH)
@@ -134,7 +135,6 @@ stages:
         pool: { vmImage: "macos-11" }
         timeoutInMinutes: 150
         variables:
-          CIBW_SKIP: "pp* cp37*"
           LIBRARY_PATH: $(LD_LIBRARY_PATH)
           DYLD_LIBRARY_PATH: $(LD_LIBRARY_PATH)
           LD_RUNPATH_SEARCH_PATH: $(LD_LIBRARY_PATH)
@@ -179,7 +179,7 @@ stages:
               python -m pip install cibuildwheel
             displayName: "Install dependencies"
 
-          - script: cibuildwheel ./imagecodecs_src
+          - script: cibuildwheel ./imagecodecs_src --config-file pyproject.toml
             displayName: "cibuildwheel"
 
           - task: PublishBuildArtifacts@1
@@ -199,13 +199,6 @@ stages:
             manylinux2014_i686:
               CIBW_SKIP: "*64 pp* cp37* cp310* *-musllinux_i686"
         pool: { vmImage: "Ubuntu-20.04" }
-        variables:
-          # work around ... to "manylinux2014_x86_64" ABI because of the presence of too-recent versioned symbols
-          # use auditwheel=4.0.0 
-          # CIBW_REPAIR_WHEEL_COMMAND: "python -m auditwheel --verbose repair -w {dest_dir} {wheel}"
-          CIBW_REPAIR_WHEEL_COMMAND: "python -m auditwheel repair -w {dest_dir} {wheel}"
-          # snappy-devel is required for building python-snappy
-          CIBW_BEFORE_TEST: "yum install -y snappy-devel;pip install scikit_build; pip install cmake"
         steps:
           - checkout: self
             submodules: true
@@ -220,7 +213,7 @@ stages:
               python -m pip install cibuildwheel
             displayName: "Install dependencies"
 
-          - script: cibuildwheel ./imagecodecs_src
+          - script: cibuildwheel ./imagecodecs_src --config-file pyproject.toml
             displayName: "cibuildwheel"
 
           - task: PublishBuildArtifacts@1

azure-pipelines.yaml

@@ -0,0 +1,19 @@
+
+[tool.cibuildwheel]
+test-command = "python -m pytest {project}/imagecodecs_src/tests/ --timeout=300"
+test-requires = "-r requirements_azure.txt"
+manylinux-x86_64-image = "cgohlke/imagecodecs_manylinux2014_x86_64:2022.12.22"
+manylinux-i686-image = "cgohlke/imagecodecs_manylinux2014_i686:2022.12.22"
+manylinux-pypy_x86_64-image = "cgohlke/imagecodecs_manylinux2014_x86_64:2022.12.22"
+before-build = "pip install oldest-supported-numpy cython auditwheel==4.0.0"
+environment = "AEC_TEST_EXTENDED=1 IMAGECODECS_CIBW=1"
+build = "cp3[8-9]* cp31[0-2]*"
+skip = "cp311*aarch64"
+
+[[tool.cibuildwheel.overrides]]
+select = "*manylinux*"
+# work around ... to "manylinux2014_x86_64" ABI because of the presence of too-recent versioned symbols
+# use auditwheel=4.0.0 
+repair-wheel-command = "python -m auditwheel repair -w {dest_dir} {wheel}"
+# snappy-devel is required for building python-snappy
+before-test = "yum install -y snappy-devel;pip install scikit_build; pip install cmake"