Merge branch 'ci/build-m1-wheel' of github.com:armenzg/psycopg2 into ci/build-m1-wheel

.github/workflows/m1.yml

@@ -1,9 +1,9 @@
 ---
+# This is temporary; We will need to move to packages.yml
 name: Build packages (M1)
 on:
   - push
 
-
 jobs:
   # This only uploads the arm64 wheels for Apple M1 Silicon usage
   build-macos-arm64:
@@ -23,7 +23,7 @@ jobs:
         # Read about options here https://cibuildwheel.readthedocs.io/en/stable/options
         env:
           CIBW_ARCHS: arm64
-          # XXX: temp: faster
+          # XXX: temp: only one version to build
           CIBW_BUILD: cp39-macosx_arm64
           # It silences a warning since we can't test on Apple Silicon runners
           CIBW_TEST_SKIP: "*-macosx_arm64"
@@ -32,6 +32,7 @@ jobs:
 
       - run: |
           ls -l
+          ls -l wheelhouse
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -40,11 +41,7 @@ jobs:
           path: ./wheelhouse/*.whl
 
   build-macos:
-    runs-on: macos-10.15
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.8']
+    runs-on: macos-11.0
 
     steps:
       - name: Checkout repos
@@ -53,7 +50,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.8
 
       - name: Build packages
         run: ./scripts/build/build_macos.sh
@@ -62,7 +59,7 @@ jobs:
           PSYCOPG2_TESTDB: postgres
           PSYCOPG2_TEST_FAST: 1
           ARCHFLAGS: "-arch arm64"
-          _PYTHON_HOST_PLATFORM: "macosx-11.0-arm64"
+          _PYTHON_HOST_PLATFORM: macosx-11.0-arm64
 
       - run: |
           ls -l

.github/workflows/packages.yml

@@ -3,7 +3,6 @@ name: Build packages
 on:
   - workflow_dispatch
 
-
 jobs:
   build-sdist:
     strategy:
@@ -51,16 +50,15 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-
   build-manylinux:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - {tag: manylinux2014, arch: x86_64}
-          - {tag: manylinux2014, arch: i686}
-          - {tag: manylinux_2_24, arch: aarch64}
-          - {tag: manylinux_2_24, arch: ppc64le}
+          - { tag: manylinux2014, arch: x86_64 }
+          - { tag: manylinux2014, arch: i686 }
+          - { tag: manylinux_2_24, arch: aarch64 }
+          - { tag: manylinux_2_24, arch: ppc64le }
 
     runs-on: ubuntu-20.04
     steps:
@@ -107,13 +105,12 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-
   build-macos:
     runs-on: macos-10.15
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ["3.6", "3.7", "3.8", "3.9"]
 
     steps:
       - name: Checkout repos
@@ -137,30 +134,3 @@ jobs:
           name: packages_macos
           path: |
             dist/*/*${{ matrix.platform }}.whl
-
-  # This only uploads the arm64 wheels for Apple M1 Silicon usage
-  build-macos-arm64:
-    runs-on: macos-11.0
-    name: "build-macos (3.8-3.10, arm64)"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Start postgresql service
-        # This skips updating brew when installing a package
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
-        run: |
-          brew services start postgresql
-
-      # This builds all possible Python versions (currently, 3.8 to 3.10)
-      - uses: pypa/cibuildwheel@v2.1.1
-        # Read about options here https://cibuildwheel.readthedocs.io/en/stable/options
-        env:
-          CIBW_ARCHS: arm64
-          # This allows substitution within setup.py
-          PACKAGE_NAME: psycopg2-binary
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: packages_macos_arm64
-          path: ./wheelhouse/*.whl

scripts/build/build_macos.sh

@@ -55,26 +55,23 @@ fi
 cp ${wheeldir}/*.whl ${distdir}
 
 # kill the libpq to make sure tests don't depend on it
-mv "$LIBPQ" "${LIBPQ}-bye"
+[[ -z "${LIBPQ:-}" ]] && mv "$LIBPQ" "${LIBPQ}-bye"
 
-# XXX: Move this code into a test script
-if [[ $(uname -m) != 'arm64' ]]; then
-    # Install and test the built wheel
-    pip install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
+# Install and test the built wheel
+pip install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
 
-    # Print psycopg and libpq versions
-    python -c "import psycopg2; print(psycopg2.__version__)"
-    python -c "import psycopg2; print(psycopg2.__libpq_version__)"
-    python -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
+# Print psycopg and libpq versions
+python -c "import psycopg2; print(psycopg2.__version__)"
+python -c "import psycopg2; print(psycopg2.__libpq_version__)"
+python -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
 
-    # fail if we are not using the expected libpq library
-    # Disabled as we just use what's available on the system on macOS
-    # if [[ "${WANT_LIBPQ:-}" ]]; then
-    #     python -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
-    # fi
+# fail if we are not using the expected libpq library
+# Disabled as we just use what's available on the system on macOS
+# if [[ "${WANT_LIBPQ:-}" ]]; then
+#     python -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
+# fi
 
-    python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
-fi
+python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
 
 # just because I'm a boy scout
-mv "${LIBPQ}-bye" "$LIBPQ"
+[[ -z "${LIBPQ:-}" ]] && mv "${LIBPQ}-bye" "$LIBPQ"