From d64f2fb85647df80d82fd8fc1efd55d92491e9bc Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 27 Nov 2023 19:59:35 +0100 Subject: [PATCH 01/48] WIP: Use cibuildwheel to build binary wheels First working version. Probably needs some brushing up :) --- pyproject.toml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..63c3ad5 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,47 @@ +[build-system] +requires = [ + "build", + "cmake>=3.18", + "oldest-supported-numpy", + "setuptools", + "wheel", +] + +[tool.cibuildwheel] +build = "cp3{7,8,9,10,11}-*_x86_64" +build-verbosity = 1 +environment = """ \ + CFLAGS="-I/usr/include/cfitsio" \ + LD_LIBRARY_PATH=/opt/boost/lib \ +""" +test-command = "cd {package}/tests && pytest" +test-requires = "pytest" + +[tool.cibuildwheel.macos] +repair-wheel-command = """\ + DYLD_LIBRARY_PATH=${BOOST_INSTALL_DIR}/lib delocate-wheel \ + --require-archs {delocate_archs} -w {dest_dir} -v {wheel}\ +""" + +[tool.cibuildwheel.linux] +skip = ["*-musllinux_*"] + +[[tool.cibuildwheel.overrides]] +select="cp37-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel37" + +[[tool.cibuildwheel.overrides]] +select="cp38-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel38" + +[[tool.cibuildwheel.overrides]] +select="cp39-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel39" + +[[tool.cibuildwheel.overrides]] +select="cp310-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel310" + +[[tool.cibuildwheel.overrides]] +select="cp311-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel311" From 3045b47521490e483acd139629e2b81a467a9722 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 27 Nov 2023 20:18:58 +0100 Subject: [PATCH 02/48] WIP: Use cibuildwheel in github workflow Removed existing `linux.yml` and `osx.yml` to avoid interference with new `build_release.yml`. At a later stage, we may want to revive some parts of the old workflows. --- .github/workflows/build_release.yml | 70 +++++++++++++++++++++++++++++ .github/workflows/linux.yml | 58 ------------------------ .github/workflows/osx.yml | 45 ------------------- 3 files changed, 70 insertions(+), 103 deletions(-) create mode 100644 .github/workflows/build_release.yml delete mode 100644 .github/workflows/linux.yml delete mode 100644 .github/workflows/osx.yml diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml new file mode 100644 index 0000000..3185d59 --- /dev/null +++ b/.github/workflows/build_release.yml @@ -0,0 +1,70 @@ +name: Build and upload to PyPI + +# Only build and upload when a new release tag is created +# on: +# push: +# tags: +# - "v[0-9]+.[0-9]+.[0-9]+" +# - "v[0-9]+.[0-9]+.[0-9]+[a-z]+[0-9]+" +# Alternatively, build on every branch push, tag push, and pull request change +on: [push, pull_request] + +jobs: + build_wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + + steps: + - uses: actions/checkout@v3 + + # - name: Setup GNU Fortran + # uses: modflowpy/install-gfortran-action@v1 + # id: macos-setup-fortran + # if: runner.os == 'macOS' + + - name: Build wheels + uses: pypa/cibuildwheel@v2.12.3 + + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + path: wheelhouse/*.whl + + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Build sdist + run: pipx run build --sdist + + - uses: actions/upload-artifact@v3 + with: + path: dist/*.tar.gz + + # upload_pypi: + # needs: [build_wheels, build_sdist] + # runs-on: ubuntu-latest + # # upload to PyPI on every tag starting with 'v' + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + # # alternatively, to publish when a GitHub Release is created, use the following rule: + # # if: github.event_name == 'release' && github.event.action == 'published' + # steps: + # - uses: actions/download-artifact@v3 + # with: + # # unpacks default artifact into dist/ + # # if `name: artifact` is omitted, the action will create extra parent dir + # name: artifact + # path: dist + + # - uses: pypa/gh-action-pypi-publish@v1.5.0 + # with: + # user: __token__ + # password: ${{ secrets.pypi_password }} + # # # To test: + # # repository_url: https://test.pypi.org/legacy/ + # # password: ${{ secrets.test_pypi_password }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml deleted file mode 100644 index 4cec58e..0000000 --- a/.github/workflows/linux.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Linux - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - tests: - runs-on: ubuntu-20.04 -# continue-on-error: true - strategy: - matrix: - dist: -# - pep8 -# - mypy - - py2_kern6 - - py3_kern6 - - py3_kern7 - - py3_casacore_master - - py3_casacore_v3.3 - - py3_casacore_v3.4 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Build container - run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker - - -# wheels: -# runs-on: ubuntu-20.04 -# continue-on-error: true -# strategy: -# matrix: -# dist: -# - py36_binary_wheel -# - py37_binary_wheel -# - py38_binary_wheel -# - py39_binary_wheel -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# -# - name: Build container -# run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker -# -# - name: Get wheel -# run: | -# mkdir -p bridge -# docker run -v `pwd`/bridge:/bridge ${{ matrix.dist }} sh -c "cp /output/*.whl /bridge/." -# -# - uses: actions/upload-artifact@v2 -# name: Publish Linux binary wheels -# with: -# path: bridge/*.whl -# \ No newline at end of file diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml deleted file mode 100644 index 21b3783..0000000 --- a/.github/workflows/osx.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: OS X - -on: - push: - branches: [ master ] - tags: [ "*" ] - pull_request: - branches: [ master ] - -jobs: - osx: - runs-on: macos-10.15 - continue-on-error: true - - steps: - - name: checkout - uses: actions/checkout@v2 - - - name: install homebrew packages - run: | - brew tap casacore/tap - brew install casacore --with-python - - - name: make virtualenv - run: python3 -m venv venv - - - name: Install Python dependencies - run: venv/bin/pip install --upgrade pip wheel delocate pytest - - - name: Compile and install python-casacore - run: CFLAGS="-I/usr/local/include -L/usr/local/lib" venv/bin/pip install . - - - name: Run pytest - run: venv/bin/pytest - - - name: make binary wheel - run: venv/bin/python3 setup.py bdist_wheel - - - name: Delocate binary wheel - run: venv/bin/delocate-wheel -v dist/*.whl - - - name: Publish OS X binary wheels - uses: actions/upload-artifact@v2 - with: - path: dist/*.whl From a1c1f035e20daac4c652568e8a4a8c0bb254aa4a Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 27 Nov 2023 20:24:54 +0100 Subject: [PATCH 03/48] Revert "WIP: Use cibuildwheel in github workflow" Casacore base images do not yet exist. So, I cannot yet test the new workflow. Best to revert for now. This reverts commit 3045b47521490e483acd139629e2b81a467a9722. --- .github/workflows/build_release.yml | 70 ----------------------------- .github/workflows/linux.yml | 58 ++++++++++++++++++++++++ .github/workflows/osx.yml | 45 +++++++++++++++++++ 3 files changed, 103 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/build_release.yml create mode 100644 .github/workflows/linux.yml create mode 100644 .github/workflows/osx.yml diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml deleted file mode 100644 index 3185d59..0000000 --- a/.github/workflows/build_release.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: Build and upload to PyPI - -# Only build and upload when a new release tag is created -# on: -# push: -# tags: -# - "v[0-9]+.[0-9]+.[0-9]+" -# - "v[0-9]+.[0-9]+.[0-9]+[a-z]+[0-9]+" -# Alternatively, build on every branch push, tag push, and pull request change -on: [push, pull_request] - -jobs: - build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - - steps: - - uses: actions/checkout@v3 - - # - name: Setup GNU Fortran - # uses: modflowpy/install-gfortran-action@v1 - # id: macos-setup-fortran - # if: runner.os == 'macOS' - - - name: Build wheels - uses: pypa/cibuildwheel@v2.12.3 - - - name: Upload wheels - uses: actions/upload-artifact@v3 - with: - path: wheelhouse/*.whl - - build_sdist: - name: Build source distribution - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Build sdist - run: pipx run build --sdist - - - uses: actions/upload-artifact@v3 - with: - path: dist/*.tar.gz - - # upload_pypi: - # needs: [build_wheels, build_sdist] - # runs-on: ubuntu-latest - # # upload to PyPI on every tag starting with 'v' - # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - # # alternatively, to publish when a GitHub Release is created, use the following rule: - # # if: github.event_name == 'release' && github.event.action == 'published' - # steps: - # - uses: actions/download-artifact@v3 - # with: - # # unpacks default artifact into dist/ - # # if `name: artifact` is omitted, the action will create extra parent dir - # name: artifact - # path: dist - - # - uses: pypa/gh-action-pypi-publish@v1.5.0 - # with: - # user: __token__ - # password: ${{ secrets.pypi_password }} - # # # To test: - # # repository_url: https://test.pypi.org/legacy/ - # # password: ${{ secrets.test_pypi_password }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 0000000..4cec58e --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,58 @@ +name: Linux + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + tests: + runs-on: ubuntu-20.04 +# continue-on-error: true + strategy: + matrix: + dist: +# - pep8 +# - mypy + - py2_kern6 + - py3_kern6 + - py3_kern7 + - py3_casacore_master + - py3_casacore_v3.3 + - py3_casacore_v3.4 + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Build container + run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker + + +# wheels: +# runs-on: ubuntu-20.04 +# continue-on-error: true +# strategy: +# matrix: +# dist: +# - py36_binary_wheel +# - py37_binary_wheel +# - py38_binary_wheel +# - py39_binary_wheel +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# +# - name: Build container +# run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker +# +# - name: Get wheel +# run: | +# mkdir -p bridge +# docker run -v `pwd`/bridge:/bridge ${{ matrix.dist }} sh -c "cp /output/*.whl /bridge/." +# +# - uses: actions/upload-artifact@v2 +# name: Publish Linux binary wheels +# with: +# path: bridge/*.whl +# \ No newline at end of file diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml new file mode 100644 index 0000000..21b3783 --- /dev/null +++ b/.github/workflows/osx.yml @@ -0,0 +1,45 @@ +name: OS X + +on: + push: + branches: [ master ] + tags: [ "*" ] + pull_request: + branches: [ master ] + +jobs: + osx: + runs-on: macos-10.15 + continue-on-error: true + + steps: + - name: checkout + uses: actions/checkout@v2 + + - name: install homebrew packages + run: | + brew tap casacore/tap + brew install casacore --with-python + + - name: make virtualenv + run: python3 -m venv venv + + - name: Install Python dependencies + run: venv/bin/pip install --upgrade pip wheel delocate pytest + + - name: Compile and install python-casacore + run: CFLAGS="-I/usr/local/include -L/usr/local/lib" venv/bin/pip install . + + - name: Run pytest + run: venv/bin/pytest + + - name: make binary wheel + run: venv/bin/python3 setup.py bdist_wheel + + - name: Delocate binary wheel + run: venv/bin/delocate-wheel -v dist/*.whl + + - name: Publish OS X binary wheels + uses: actions/upload-artifact@v2 + with: + path: dist/*.whl From 3112c6c664b88f162cd0f10699d22bd11f9ffcda Mon Sep 17 00:00:00 2001 From: Ludwig Schwardt Date: Mon, 4 Dec 2023 14:34:11 +0200 Subject: [PATCH 04/48] Explicitly add Homebrew libs to support Apple M1 In the grand old days, Homebrew installed to `/usr/local` and all was well. Now, however, while Intel Homebrew still does this, Apple Silicon / M1 / M2 Homebrew has gone and picked a new prefix: `/opt/homebrew`. A good explanation of the rationale is at https://earthly.dev/blog/homebrew-on-m1/. Basically, Homebrew had to admit that Fink and MacPorts were right. :-P The solution is to call `brew --prefix` and add those libraries explicitly to the search list. Keep going if brew is not installed. This addresses #252. --- setup.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7bb3650..7bded63 100755 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ Setup script for the CASACORE python wrapper. """ import os +import subprocess import sys import warnings from setuptools import setup, Extension, find_packages @@ -52,7 +53,17 @@ def find_library_file(libname): if 'LD_LIBRARY_PATH' in os.environ: lib_dirs += os.environ['LD_LIBRARY_PATH'].split(':') - + # Look for Homebrewed libraries + try: + homebrew_prefix = subprocess.run( + ['brew', '--prefix'], + capture_output=True, + check=True, + text=True + ).stdout.strip() + lib_dirs.append(join(homebrew_prefix, 'lib')) + except subprocess.CalledProcessError: + pass # Append default search path (not a complete list) lib_dirs += [join(sys.prefix, 'lib'), '/usr/local/lib', From fa616fceb3a9b6eaae5b135ec6a1628ccc3bb09b Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 8 Jan 2024 16:51:48 +0100 Subject: [PATCH 05/48] Disable python 3.6 based steps The CI/CD pipeline still uses some old kern-6 docker images based on Python 3.6. The code no longer works with Python 3.6, and we have dropped support for it. Disabled the offending steps. --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4cec58e..f8672c3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -15,11 +15,11 @@ jobs: dist: # - pep8 # - mypy - - py2_kern6 - - py3_kern6 +# - py2_kern6 +# - py3_kern6 - py3_kern7 - py3_casacore_master - - py3_casacore_v3.3 +# - py3_casacore_v3.3 - py3_casacore_v3.4 steps: - name: Checkout @@ -55,4 +55,4 @@ jobs: # name: Publish Linux binary wheels # with: # path: bridge/*.whl -# \ No newline at end of file +# From cb15b62d4be1089cea281cc3117bc767baa8ec17 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 8 Jan 2024 17:14:27 +0100 Subject: [PATCH 06/48] Update py3_casacore_v3.4.docker Replace `ADD` with `COPY` to see if error disappears. --- .github/workflows/py3_casacore_v3.4.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/py3_casacore_v3.4.docker b/.github/workflows/py3_casacore_v3.4.docker index 2d12b0b..1f14401 100644 --- a/.github/workflows/py3_casacore_v3.4.docker +++ b/.github/workflows/py3_casacore_v3.4.docker @@ -11,7 +11,7 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code +COPY . /code WORKDIR /code RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt From 8d8e2f37b956c4dcfafe69169ce16394adfed6c4 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Tue, 9 Jan 2024 17:03:55 +0100 Subject: [PATCH 07/48] Revert "Update py3_casacore_v3.4.docker" This reverts commit cb15b62d4be1089cea281cc3117bc767baa8ec17. --- .github/workflows/py3_casacore_v3.4.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/py3_casacore_v3.4.docker b/.github/workflows/py3_casacore_v3.4.docker index 1f14401..2d12b0b 100644 --- a/.github/workflows/py3_casacore_v3.4.docker +++ b/.github/workflows/py3_casacore_v3.4.docker @@ -11,7 +11,7 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -COPY . /code +ADD . /code WORKDIR /code RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt From 91e0cb7ef507f98dbcd2a5e3584fe43ce1d0cddc Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Tue, 16 Jan 2024 16:58:21 +0100 Subject: [PATCH 08/48] WIP: Use new docker image naming scheme --- pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 63c3ad5..ccfffb1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,20 +28,20 @@ skip = ["*-musllinux_*"] [[tool.cibuildwheel.overrides]] select="cp37-*" -manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel37" +manylinux-x86_64-image = "quay.io/casacore/casacore:py37_master" [[tool.cibuildwheel.overrides]] select="cp38-*" -manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel38" +manylinux-x86_64-image = "quay.io/casacore/casacore:py38_master" [[tool.cibuildwheel.overrides]] select="cp39-*" -manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel39" +manylinux-x86_64-image = "quay.io/casacore/casacore:py39_master" [[tool.cibuildwheel.overrides]] select="cp310-*" -manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel310" +manylinux-x86_64-image = "quay.io/casacore/casacore:py310_master" [[tool.cibuildwheel.overrides]] select="cp311-*" -manylinux-x86_64-image = "quay.io/casacore/casacore:master_wheel311" +manylinux-x86_64-image = "quay.io/casacore/casacore:py311_master" From d2a508720f7b3cee0cf2793ab53504a07f5230f9 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 14:24:30 +0100 Subject: [PATCH 09/48] Add new workflow to build releases using cibuildwheel --- .github/workflows/build_release.yml | 70 +++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/build_release.yml diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml new file mode 100644 index 0000000..06d5488 --- /dev/null +++ b/.github/workflows/build_release.yml @@ -0,0 +1,70 @@ +name: Build and upload to PyPI + +# Only build and upload when a new release tag is created +# on: +# push: +# tags: +# - "v[0-9]+.[0-9]+.[0-9]+" +# - "v[0-9]+.[0-9]+.[0-9]+[a-z]+[0-9]+" +# Alternatively, build on every branch push, tag push, and pull request change +on: [push, pull_request] + +jobs: + build_wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + + steps: + - uses: actions/checkout@v4 + + # - name: Setup GNU Fortran + # uses: modflowpy/install-gfortran-action@v1 + # id: macos-setup-fortran + # if: runner.os == 'macOS' + + - name: Build wheels + uses: pypa/cibuildwheel@v2.16 + + - name: Upload wheels + uses: actions/upload-artifact@v4 + with: + path: wheelhouse/*.whl + + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Build sdist + run: pipx run build --sdist + + - uses: actions/upload-artifact@v4 + with: + path: dist/*.tar.gz + + # upload_pypi: + # needs: [build_wheels, build_sdist] + # runs-on: ubuntu-latest + # # upload to PyPI on every tag starting with 'v' + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + # # alternatively, to publish when a GitHub Release is created, use the following rule: + # # if: github.event_name == 'release' && github.event.action == 'published' + # steps: + # - uses: actions/download-artifact@v4 + # with: + # # unpacks default artifact into dist/ + # # if `name: artifact` is omitted, the action will create extra parent dir + # name: artifact + # path: dist + + # - uses: pypa/gh-action-pypi-publish@v1.8.11 + # with: + # user: __token__ + # password: ${{ secrets.pypi_password }} + # # # To test: + # # repository_url: https://test.pypi.org/legacy/ + # # password: ${{ secrets.test_pypi_password }} From e49c1945490fbf09c383fc261a5696f3eef04802 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 14:29:23 +0100 Subject: [PATCH 10/48] WIP: Only build for Ubuntu for now --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 06d5488..7df1020 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] #, macos-latest] steps: - uses: actions/checkout@v4 From 856df59987343d7b2d7f0a0106465543175664ec Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 14:40:37 +0100 Subject: [PATCH 11/48] WIP: Only sdist, try upload --- .github/workflows/build_release.yml | 83 +++++++++++++++-------------- pyproject.toml | 7 ++- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 7df1020..673b065 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -10,28 +10,6 @@ name: Build and upload to PyPI on: [push, pull_request] jobs: - build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] #, macos-latest] - - steps: - - uses: actions/checkout@v4 - - # - name: Setup GNU Fortran - # uses: modflowpy/install-gfortran-action@v1 - # id: macos-setup-fortran - # if: runner.os == 'macOS' - - - name: Build wheels - uses: pypa/cibuildwheel@v2.16 - - - name: Upload wheels - uses: actions/upload-artifact@v4 - with: - path: wheelhouse/*.whl build_sdist: name: Build source distribution @@ -46,25 +24,48 @@ jobs: with: path: dist/*.tar.gz - # upload_pypi: - # needs: [build_wheels, build_sdist] - # runs-on: ubuntu-latest - # # upload to PyPI on every tag starting with 'v' - # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - # # alternatively, to publish when a GitHub Release is created, use the following rule: - # # if: github.event_name == 'release' && github.event.action == 'published' + # build_wheels: + # name: Build wheels on ${{ matrix.os }} + # runs-on: ${{ matrix.os }} + # strategy: + # matrix: + # os: [ubuntu-latest] #, macos-latest] + # steps: - # - uses: actions/download-artifact@v4 - # with: - # # unpacks default artifact into dist/ - # # if `name: artifact` is omitted, the action will create extra parent dir - # name: artifact - # path: dist + # - uses: actions/checkout@v4 - # - uses: pypa/gh-action-pypi-publish@v1.8.11 + # # - name: Setup GNU Fortran + # # uses: modflowpy/install-gfortran-action@v1 + # # id: macos-setup-fortran + # # if: runner.os == 'macOS' + + # - name: Build wheels + # uses: pypa/cibuildwheel@v2.16 + + # - name: Upload wheels + # uses: actions/upload-artifact@v4 # with: - # user: __token__ - # password: ${{ secrets.pypi_password }} - # # # To test: - # # repository_url: https://test.pypi.org/legacy/ - # # password: ${{ secrets.test_pypi_password }} + # path: wheelhouse/*.whl + + upload_pypi: + needs: [build_sdist] #, build_wheels] + runs-on: ubuntu-latest + # upload to PyPI on every tag starting with 'v' + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + # alternatively, to publish when a GitHub Release is created, use the following rule: + # if: github.event_name == 'release' && github.event.action == 'published' + steps: + - uses: actions/download-artifact@v4 + with: + # unpacks default artifact into dist/ + # if `name: artifact` is omitted, the action will create extra parent dir + name: artifact + path: dist + + - uses: pypa/gh-action-pypi-publish@v1.8.11 + with: + user: __token__ + password: ${{ secrets.pypi_password }} + # # To test: + # repository_url: https://test.pypi.org/legacy/ + # password: ${{ secrets.test_pypi_password }} diff --git a/pyproject.toml b/pyproject.toml index ccfffb1..154359a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,8 @@ requires = [ ] [tool.cibuildwheel] -build = "cp3{7,8,9,10,11}-*_x86_64" +# build = "cp3{7,8,9,10,11,12}-*_x86_64" +build = "cp312-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ @@ -45,3 +46,7 @@ manylinux-x86_64-image = "quay.io/casacore/casacore:py310_master" [[tool.cibuildwheel.overrides]] select="cp311-*" manylinux-x86_64-image = "quay.io/casacore/casacore:py311_master" + +[[tool.cibuildwheel.overrides]] +select="cp312-*" +manylinux-x86_64-image = "quay.io/casacore/casacore:py312_master" From 8fdea62c2346b9913cc091c32cdf12b363da2734 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 14:42:44 +0100 Subject: [PATCH 12/48] WIP: Only sdist, try upload (again) --- .github/workflows/build_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 673b065..67de5bb 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -51,9 +51,9 @@ jobs: needs: [build_sdist] #, build_wheels] runs-on: ubuntu-latest # upload to PyPI on every tag starting with 'v' - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - # alternatively, to publish when a GitHub Release is created, use the following rule: - # if: github.event_name == 'release' && github.event.action == 'published' + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + # # alternatively, to publish when a GitHub Release is created, use the following rule: + # # if: github.event_name == 'release' && github.event.action == 'published' steps: - uses: actions/download-artifact@v4 with: From a9d7dac06bcf9a5fb1ae416e164c0957be34d2c3 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 14:45:14 +0100 Subject: [PATCH 13/48] WIP: Only sdist, try upload to TestPyPI --- .github/workflows/build_release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 67de5bb..476f20d 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -65,7 +65,7 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: user: __token__ - password: ${{ secrets.pypi_password }} - # # To test: - # repository_url: https://test.pypi.org/legacy/ - # password: ${{ secrets.test_pypi_password }} + # password: ${{ secrets.pypi_password }} + # To test: + repository_url: https://test.pypi.org/legacy/ + password: ${{ secrets.test_pypi_password }} From 0631c32779db1497b8da19710358d6c1a56bdcd9 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 15:29:47 +0100 Subject: [PATCH 14/48] WIP: Try new trusted publishing --- .github/workflows/build_release.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 476f20d..56a2eff 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -48,8 +48,14 @@ jobs: # path: wheelhouse/*.whl upload_pypi: - needs: [build_sdist] #, build_wheels] + name: Upload release to PyPI runs-on: ubuntu-latest + needs: [build_sdist] #, build_wheels] + environment: + name: pypi + url: https://test.pypi.org/p/python-casacore + permissions: + id-token: write # upload to PyPI on every tag starting with 'v' # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') # # alternatively, to publish when a GitHub Release is created, use the following rule: @@ -64,8 +70,8 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: - user: __token__ + # user: __token__ # password: ${{ secrets.pypi_password }} # To test: - repository_url: https://test.pypi.org/legacy/ - password: ${{ secrets.test_pypi_password }} + repository-url: https://test.pypi.org/legacy/ + # password: ${{ secrets.test_pypi_password }} From 398cf1fa5d37afea3ebbcd73c801734fe4f7bc92 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 16:40:03 +0100 Subject: [PATCH 15/48] WIP: Try new trusted publishing (2nd try) --- .github/workflows/build_release.yml | 65 +++++++++++++++-------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 56a2eff..c0f0f62 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -11,49 +11,49 @@ on: [push, pull_request] jobs: - build_sdist: - name: Build source distribution - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 + # build_sdist: + # name: Build source distribution + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 - - name: Build sdist - run: pipx run build --sdist + # - name: Build sdist + # run: pipx run build --sdist - - uses: actions/upload-artifact@v4 - with: - path: dist/*.tar.gz + # - uses: actions/upload-artifact@v4 + # with: + # path: dist/*.tar.gz - # build_wheels: - # name: Build wheels on ${{ matrix.os }} - # runs-on: ${{ matrix.os }} - # strategy: - # matrix: - # os: [ubuntu-latest] #, macos-latest] + build_wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] #, macos-latest] - # steps: - # - uses: actions/checkout@v4 + steps: + - uses: actions/checkout@v4 - # # - name: Setup GNU Fortran - # # uses: modflowpy/install-gfortran-action@v1 - # # id: macos-setup-fortran - # # if: runner.os == 'macOS' + # - name: Setup GNU Fortran + # uses: modflowpy/install-gfortran-action@v1 + # id: macos-setup-fortran + # if: runner.os == 'macOS' - # - name: Build wheels - # uses: pypa/cibuildwheel@v2.16 + - name: Build wheels + uses: pypa/cibuildwheel@v2.16 - # - name: Upload wheels - # uses: actions/upload-artifact@v4 - # with: - # path: wheelhouse/*.whl + - name: Upload wheels + uses: actions/upload-artifact@v4 + with: + path: wheelhouse/*.whl upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_sdist] #, build_wheels] - environment: - name: pypi - url: https://test.pypi.org/p/python-casacore + needs: [build_wheels] # [build_sdist] #, build_wheels] + # environment: + # name: pypi + # url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' @@ -70,6 +70,7 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: + verbose: true # user: __token__ # password: ${{ secrets.pypi_password }} # To test: From e25220fc78e58e6fe72fe352af81333cf32931e2 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 16:51:07 +0100 Subject: [PATCH 16/48] WIP: Try new trusted publishing (3rd try) --- .github/workflows/build_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index c0f0f62..2c0fcb4 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -51,9 +51,9 @@ jobs: name: Upload release to PyPI runs-on: ubuntu-latest needs: [build_wheels] # [build_sdist] #, build_wheels] - # environment: - # name: pypi - # url: https://test.pypi.org/p/python-casacore + environment: + name: pypi + url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' From e6f0362dad4ee7bb352cb45a05c61df44039f90e Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 16:56:23 +0100 Subject: [PATCH 17/48] WIP: Try new trusted publishing (4th try) --- .github/workflows/build_release.yml | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 2c0fcb4..22aedba 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -7,7 +7,7 @@ name: Build and upload to PyPI # - "v[0-9]+.[0-9]+.[0-9]+" # - "v[0-9]+.[0-9]+.[0-9]+[a-z]+[0-9]+" # Alternatively, build on every branch push, tag push, and pull request change -on: [push, pull_request] +on: [push] #, pull_request] jobs: @@ -51,9 +51,9 @@ jobs: name: Upload release to PyPI runs-on: ubuntu-latest needs: [build_wheels] # [build_sdist] #, build_wheels] - environment: - name: pypi - url: https://test.pypi.org/p/python-casacore + # environment: + # name: pypi + # url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' diff --git a/pyproject.toml b/pyproject.toml index 154359a..6708d64 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [tool.cibuildwheel] # build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp312-*_x86_64" +build = "cp311-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From f448a4b3446743219535ba4b0dc961a6468cdd8c Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:24:33 +0100 Subject: [PATCH 18/48] WIP: Try new trusted publishing (5th try) --- .github/workflows/build_release.yml | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 22aedba..6c45553 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -11,18 +11,18 @@ on: [push] #, pull_request] jobs: - # build_sdist: - # name: Build source distribution - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 - # - name: Build sdist - # run: pipx run build --sdist + - name: Build sdist + run: pipx run build --sdist - # - uses: actions/upload-artifact@v4 - # with: - # path: dist/*.tar.gz + - uses: actions/upload-artifact@v4 + with: + path: dist/*.tar.gz build_wheels: name: Build wheels on ${{ matrix.os }} @@ -50,10 +50,12 @@ jobs: upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_wheels] # [build_sdist] #, build_wheels] - # environment: - # name: pypi - # url: https://test.pypi.org/p/python-casacore + needs: [build_sdist] #, build_wheels] + environment: + name: pypi + # url: https://pypi.org/p/python-casacore + # For testing + url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' @@ -70,9 +72,7 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: - verbose: true - # user: __token__ - # password: ${{ secrets.pypi_password }} # To test: repository-url: https://test.pypi.org/legacy/ - # password: ${{ secrets.test_pypi_password }} + skip-existing: true + verbose: true From 5cb66db09377bc915ad8820b820b49d83ca09870 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:25:48 +0100 Subject: [PATCH 19/48] WIP: Try new trusted publishing (needs sdist & wheels) --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 6c45553..cdbba60 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -50,7 +50,7 @@ jobs: upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_sdist] #, build_wheels] + needs: [build_sdist, build_wheels] environment: name: pypi # url: https://pypi.org/p/python-casacore From a4cad7616030f7800741e81c99ed8149107bb637 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:32:34 +0100 Subject: [PATCH 20/48] WIP: Try building for MacOS --- .github/workflows/build_release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index cdbba60..dc9472b 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -29,7 +29,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] #, macos-latest] + # os: [ubuntu-latest] #, macos-latest] + os: [macos-latest] steps: - uses: actions/checkout@v4 From 82a91a17137fc24cc785359e26d8962fbe2de2dd Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:35:08 +0100 Subject: [PATCH 21/48] WIP: MacOS doesn't work yet; not base image available --- .github/workflows/build_release.yml | 3 +-- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index dc9472b..cdbba60 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -29,8 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # os: [ubuntu-latest] #, macos-latest] - os: [macos-latest] + os: [ubuntu-latest] #, macos-latest] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 6708d64..129a348 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [tool.cibuildwheel] # build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp311-*_x86_64" +build = "cp310-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From 1486876007da004eeb8383f82460e0fa2aa8e866 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:44:41 +0100 Subject: [PATCH 22/48] WIP: Revert to 4th try --- .github/workflows/build_release.yml | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index cdbba60..22aedba 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -11,18 +11,18 @@ on: [push] #, pull_request] jobs: - build_sdist: - name: Build source distribution - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 + # build_sdist: + # name: Build source distribution + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 - - name: Build sdist - run: pipx run build --sdist + # - name: Build sdist + # run: pipx run build --sdist - - uses: actions/upload-artifact@v4 - with: - path: dist/*.tar.gz + # - uses: actions/upload-artifact@v4 + # with: + # path: dist/*.tar.gz build_wheels: name: Build wheels on ${{ matrix.os }} @@ -50,12 +50,10 @@ jobs: upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_sdist, build_wheels] - environment: - name: pypi - # url: https://pypi.org/p/python-casacore - # For testing - url: https://test.pypi.org/p/python-casacore + needs: [build_wheels] # [build_sdist] #, build_wheels] + # environment: + # name: pypi + # url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' @@ -72,7 +70,9 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: + verbose: true + # user: __token__ + # password: ${{ secrets.pypi_password }} # To test: repository-url: https://test.pypi.org/legacy/ - skip-existing: true - verbose: true + # password: ${{ secrets.test_pypi_password }} From e3163e117e4e7b40b2cd1a0876f9e79e0168fd0d Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:50:23 +0100 Subject: [PATCH 23/48] WIP: Revert to 5th try --- .github/workflows/build_release.yml | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 22aedba..6c45553 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -11,18 +11,18 @@ on: [push] #, pull_request] jobs: - # build_sdist: - # name: Build source distribution - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 - # - name: Build sdist - # run: pipx run build --sdist + - name: Build sdist + run: pipx run build --sdist - # - uses: actions/upload-artifact@v4 - # with: - # path: dist/*.tar.gz + - uses: actions/upload-artifact@v4 + with: + path: dist/*.tar.gz build_wheels: name: Build wheels on ${{ matrix.os }} @@ -50,10 +50,12 @@ jobs: upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_wheels] # [build_sdist] #, build_wheels] - # environment: - # name: pypi - # url: https://test.pypi.org/p/python-casacore + needs: [build_sdist] #, build_wheels] + environment: + name: pypi + # url: https://pypi.org/p/python-casacore + # For testing + url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' @@ -70,9 +72,7 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: - verbose: true - # user: __token__ - # password: ${{ secrets.pypi_password }} # To test: repository-url: https://test.pypi.org/legacy/ - # password: ${{ secrets.test_pypi_password }} + skip-existing: true + verbose: true From 50bdd8e70500d7b4e9604ebda597313589f2991b Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:52:51 +0100 Subject: [PATCH 24/48] WIP: Build sdist & wheels --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 6c45553..cdbba60 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -50,7 +50,7 @@ jobs: upload_pypi: name: Upload release to PyPI runs-on: ubuntu-latest - needs: [build_sdist] #, build_wheels] + needs: [build_sdist, build_wheels] environment: name: pypi # url: https://pypi.org/p/python-casacore From 51bf35fca6c783814c61797314a5542277160603 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 19 Jan 2024 17:58:52 +0100 Subject: [PATCH 25/48] WIP: Allow overwriting wheelhouse artifacts --- .github/workflows/build_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index cdbba60..bc6ad45 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -46,6 +46,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl + overwrite: true upload_pypi: name: Upload release to PyPI From 72ff06c72bf201e4c1ad267b2e33bbbb3fb6fef4 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 10:42:52 +0100 Subject: [PATCH 26/48] WIP: Build for Python 3.9 only --- .github/workflows/build_release.yml | 7 +------ pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index bc6ad45..9d49a17 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -34,11 +34,6 @@ jobs: steps: - uses: actions/checkout@v4 - # - name: Setup GNU Fortran - # uses: modflowpy/install-gfortran-action@v1 - # id: macos-setup-fortran - # if: runner.os == 'macOS' - - name: Build wheels uses: pypa/cibuildwheel@v2.16 @@ -46,7 +41,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl - overwrite: true + overwrite: true # Needed for testing only! upload_pypi: name: Upload release to PyPI diff --git a/pyproject.toml b/pyproject.toml index 129a348..82de39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [tool.cibuildwheel] # build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp310-*_x86_64" +build = "cp39-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From f502ac46015fcb020a26222dd5310642ee193bc6 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 13:19:48 +0100 Subject: [PATCH 27/48] WIP: Build for all Python versions --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 82de39b..2669503 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,7 @@ requires = [ ] [tool.cibuildwheel] -# build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp39-*_x86_64" +build = "cp3{7,8,9,10,11,12}-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From cc21cc3e1e642cbc19eba5d216ec01b640ecd82f Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 13:57:32 +0100 Subject: [PATCH 28/48] WIP: Try to push to PyPI (Python 3.7 only) --- .github/workflows/build_release.yml | 4 ++-- pyproject.toml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 9d49a17..ab2a485 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -49,9 +49,9 @@ jobs: needs: [build_sdist, build_wheels] environment: name: pypi - # url: https://pypi.org/p/python-casacore + url: https://pypi.org/p/python-casacore # For testing - url: https://test.pypi.org/p/python-casacore + # url: https://test.pypi.org/p/python-casacore permissions: id-token: write # upload to PyPI on every tag starting with 'v' diff --git a/pyproject.toml b/pyproject.toml index 2669503..fe1ddff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,8 @@ requires = [ ] [tool.cibuildwheel] -build = "cp3{7,8,9,10,11,12}-*_x86_64" +# build = "cp3{7,8,9,10,11,12}-*_x86_64" +build = "cp37-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From 531509bfdaad4d23ece72c62ffdf6a7a8d7e550c Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:06:07 +0100 Subject: [PATCH 29/48] WIP: Should now only upload when tag is created --- .github/workflows/build_release.yml | 8 ++++---- pyproject.toml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index ab2a485..0919300 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -54,10 +54,10 @@ jobs: # url: https://test.pypi.org/p/python-casacore permissions: id-token: write - # upload to PyPI on every tag starting with 'v' - # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - # # alternatively, to publish when a GitHub Release is created, use the following rule: - # # if: github.event_name == 'release' && github.event.action == 'published' + # Upload to PyPI on every tag starting with 'v' + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + # Alternatively, to publish when a GitHub Release is created, use the following rule: + # if: github.event_name == 'release' && github.event.action == 'published' steps: - uses: actions/download-artifact@v4 with: diff --git a/pyproject.toml b/pyproject.toml index fe1ddff..2669503 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,7 @@ requires = [ ] [tool.cibuildwheel] -# build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp37-*_x86_64" +build = "cp3{7,8,9,10,11,12}-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From 034034115b4b1f4975af7363b197fa56883d7b3c Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:08:16 +0100 Subject: [PATCH 30/48] WIP: Should now only upload when tag is created (Python 3.7 only) --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 2669503..00749c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ requires = [ [tool.cibuildwheel] build = "cp3{7,8,9,10,11,12}-*_x86_64" +build = "cp37-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From 1d90bf7a31a2c73c3a271997712587535cd6b207 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:09:05 +0100 Subject: [PATCH 31/48] WIP: Should now only upload when tag is created (Python 3.7 only) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 00749c2..fe1ddff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ requires = [ ] [tool.cibuildwheel] -build = "cp3{7,8,9,10,11,12}-*_x86_64" +# build = "cp3{7,8,9,10,11,12}-*_x86_64" build = "cp37-*_x86_64" build-verbosity = 1 environment = """ \ From e34b4a5aaf65b7fa55d11b40a4ed11a4ac02a55d Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:32:57 +0100 Subject: [PATCH 32/48] WIP: Build for all python versions; upload only when tag is created --- .github/workflows/build_release.yml | 2 +- pyproject.toml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 0919300..769a155 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -69,6 +69,6 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: # To test: - repository-url: https://test.pypi.org/legacy/ + # repository-url: https://test.pypi.org/legacy/ skip-existing: true verbose: true diff --git a/pyproject.toml b/pyproject.toml index fe1ddff..2669503 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,7 @@ requires = [ ] [tool.cibuildwheel] -# build = "cp3{7,8,9,10,11,12}-*_x86_64" -build = "cp37-*_x86_64" +build = "cp3{7,8,9,10,11,12}-*_x86_64" build-verbosity = 1 environment = """ \ CFLAGS="-I/usr/include/cfitsio" \ From e049f8ec21b3a9b12ffab3cb96c4d92fc008ecb2 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:35:16 +0100 Subject: [PATCH 33/48] WIP: Upload to TestPyPI (but only when tag is created) --- .github/workflows/build_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 769a155..bc2aba9 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -49,9 +49,9 @@ jobs: needs: [build_sdist, build_wheels] environment: name: pypi - url: https://pypi.org/p/python-casacore + # url: https://pypi.org/p/python-casacore # For testing - # url: https://test.pypi.org/p/python-casacore + url: https://test.pypi.org/p/python-casacore permissions: id-token: write # Upload to PyPI on every tag starting with 'v' @@ -69,6 +69,6 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: # To test: - # repository-url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ skip-existing: true verbose: true From d6fa59f324515bf10d48000cd0d0006e9ae1fe81 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 14:50:09 +0100 Subject: [PATCH 34/48] WIP: Final tweaks --- .github/workflows/build_release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index bc2aba9..3978b87 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -41,7 +41,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl - overwrite: true # Needed for testing only! + # overwrite: true # Only use when testing! upload_pypi: name: Upload release to PyPI @@ -49,9 +49,9 @@ jobs: needs: [build_sdist, build_wheels] environment: name: pypi - # url: https://pypi.org/p/python-casacore - # For testing - url: https://test.pypi.org/p/python-casacore + url: https://pypi.org/p/python-casacore + # For testing, use TestPyPI + # url: https://test.pypi.org/p/python-casacore permissions: id-token: write # Upload to PyPI on every tag starting with 'v' @@ -68,7 +68,7 @@ jobs: - uses: pypa/gh-action-pypi-publish@v1.8.11 with: - # To test: - repository-url: https://test.pypi.org/legacy/ + # For testing, use TestPyPI + # repository-url: https://test.pypi.org/legacy/ skip-existing: true verbose: true From b4ce39962756d5d6635168be55585438ad41134c Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 15:40:05 +0100 Subject: [PATCH 35/48] WIP: Revert 'fixes' to Linux workflow --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f8672c3..4cec58e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -15,11 +15,11 @@ jobs: dist: # - pep8 # - mypy -# - py2_kern6 -# - py3_kern6 + - py2_kern6 + - py3_kern6 - py3_kern7 - py3_casacore_master -# - py3_casacore_v3.3 + - py3_casacore_v3.3 - py3_casacore_v3.4 steps: - name: Checkout @@ -55,4 +55,4 @@ jobs: # name: Publish Linux binary wheels # with: # path: bridge/*.whl -# +# \ No newline at end of file From 20f8f8cd630ff6e0bb2ac55d1ba6222915735bd6 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 15:43:01 +0100 Subject: [PATCH 36/48] WIP: Try to build for MacOS (only) --- .github/workflows/build_release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 3978b87..3aee5ad 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -29,7 +29,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] #, macos-latest] + # os: [ubuntu-latest] #, macos-latest] + os: [macos-latest] steps: - uses: actions/checkout@v4 From 51a4c4271a6dad3a47dccfdc93cdde551658adf7 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 5 Feb 2024 15:53:48 +0100 Subject: [PATCH 37/48] Revert "WIP: Try to build for MacOS (only)" This reverts commit 20f8f8cd630ff6e0bb2ac55d1ba6222915735bd6. --- .github/workflows/build_release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 3aee5ad..3978b87 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -29,8 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # os: [ubuntu-latest] #, macos-latest] - os: [macos-latest] + os: [ubuntu-latest] #, macos-latest] steps: - uses: actions/checkout@v4 From 0875119e88255fffbba718edad05b0031e3c1ab9 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 20:55:51 +0100 Subject: [PATCH 38/48] Disable use of old docker images Some docker images use Python 3.6, which is no longer supported. These have been disabled. --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4cec58e..f8672c3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -15,11 +15,11 @@ jobs: dist: # - pep8 # - mypy - - py2_kern6 - - py3_kern6 +# - py2_kern6 +# - py3_kern6 - py3_kern7 - py3_casacore_master - - py3_casacore_v3.3 +# - py3_casacore_v3.3 - py3_casacore_v3.4 steps: - name: Checkout @@ -55,4 +55,4 @@ jobs: # name: Publish Linux binary wheels # with: # path: bridge/*.whl -# \ No newline at end of file +# From e0ddcee07b1d46a46fac8ec4217a40ea526ea417 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:04:44 +0100 Subject: [PATCH 39/48] Bump version of actions checkout and upload-artifact --- .github/workflows/linux.yml | 2 +- .github/workflows/osx.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f8672c3..2adf36c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,7 +23,7 @@ jobs: - py3_casacore_v3.4 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build container run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 21b3783..61e1165 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -14,7 +14,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: install homebrew packages run: | @@ -40,6 +40,6 @@ jobs: run: venv/bin/delocate-wheel -v dist/*.whl - name: Publish OS X binary wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: dist/*.whl From cbb8e2c92df5c5b9a94f79a919765f2709dc3cec Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:15:17 +0100 Subject: [PATCH 40/48] WIP: Replace ADD with COPY to see if that solves the failing build issue --- .github/workflows/py3_casacore_master.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/py3_casacore_master.docker b/.github/workflows/py3_casacore_master.docker index c0f7cec..66fd089 100644 --- a/.github/workflows/py3_casacore_master.docker +++ b/.github/workflows/py3_casacore_master.docker @@ -11,7 +11,7 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code +COPY . /code WORKDIR /code RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt From ff707f124260fe45fa52cc6344f68398292c5bd0 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:20:49 +0100 Subject: [PATCH 41/48] WIP: Set WORKDIR before ADDing directory --- .github/workflows/py3_casacore_master.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/py3_casacore_master.docker b/.github/workflows/py3_casacore_master.docker index 66fd089..809866c 100644 --- a/.github/workflows/py3_casacore_master.docker +++ b/.github/workflows/py3_casacore_master.docker @@ -11,8 +11,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -COPY . /code WORKDIR /code +ADD . . RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore From 8342379253e14cc16d5a4928667ffc53a538114e Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:25:28 +0100 Subject: [PATCH 42/48] WIP: Is there something special about the directory /code? --- .github/workflows/py3_casacore_master.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/py3_casacore_master.docker b/.github/workflows/py3_casacore_master.docker index 809866c..a3cbad7 100644 --- a/.github/workflows/py3_casacore_master.docker +++ b/.github/workflows/py3_casacore_master.docker @@ -11,8 +11,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -WORKDIR /code -ADD . . +ADD . /src +WORKDIR /src RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore From 17ec0585f48ea5ce1450435772a57f204afaa31c Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:29:02 +0100 Subject: [PATCH 43/48] WIP: Looks like /code is a forbidden directory name for GitHub workflows --- .github/workflows/py3_casacore_v3.4.docker | 4 ++-- .github/workflows/py3_kern7.docker | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/py3_casacore_v3.4.docker b/.github/workflows/py3_casacore_v3.4.docker index 2d12b0b..ac00188 100644 --- a/.github/workflows/py3_casacore_v3.4.docker +++ b/.github/workflows/py3_casacore_v3.4.docker @@ -11,8 +11,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore diff --git a/.github/workflows/py3_kern7.docker b/.github/workflows/py3_kern7.docker index 5cd7486..ddc9387 100644 --- a/.github/workflows/py3_kern7.docker +++ b/.github/workflows/py3_kern7.docker @@ -13,8 +13,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore From 1d707129bbf40040d1040e38c86cdddc22a4eafd Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:35:34 +0100 Subject: [PATCH 44/48] WIP: Replace /code with /src in Docker files It looks like /code is a forbidden directory name for Docker files used in GitHub workflows. Replaced /code with /src. --- .github/workflows/mypy.docker | 4 ++-- .github/workflows/pep8.docker | 4 ++-- .github/workflows/py2_kern6.docker | 4 ++-- .github/workflows/py3_casacore_v3.3.docker | 4 ++-- .github/workflows/py3_kern6.docker | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/mypy.docker b/.github/workflows/mypy.docker index ba41270..0aa2a30 100644 --- a/.github/workflows/mypy.docker +++ b/.github/workflows/mypy.docker @@ -1,7 +1,7 @@ FROM kernsuite/base:7 RUN docker-apt-install python3-pip RUN pip3 install mypy -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN mypy --ignore-missing-imports casacore diff --git a/.github/workflows/pep8.docker b/.github/workflows/pep8.docker index d593bf4..f2856e2 100644 --- a/.github/workflows/pep8.docker +++ b/.github/workflows/pep8.docker @@ -1,7 +1,7 @@ FROM kernsuite/base:7 RUN docker-apt-install python3-pip RUN pip3 install pycodestyle -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pycodestyle casacore --ignore=E501 diff --git a/.github/workflows/py2_kern6.docker b/.github/workflows/py2_kern6.docker index f764a2a..7a3dd76 100644 --- a/.github/workflows/py2_kern6.docker +++ b/.github/workflows/py2_kern6.docker @@ -12,8 +12,8 @@ RUN docker-apt-install \ python-six \ python-pip \ python-nose -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pip install -e . RUN pip install -r tests/requirements.txt RUN nosetests --with-coverage --verbose --cover-package=casacore diff --git a/.github/workflows/py3_casacore_v3.3.docker b/.github/workflows/py3_casacore_v3.3.docker index befe104..07fdc5c 100644 --- a/.github/workflows/py3_casacore_v3.3.docker +++ b/.github/workflows/py3_casacore_v3.3.docker @@ -11,8 +11,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore diff --git a/.github/workflows/py3_kern6.docker b/.github/workflows/py3_kern6.docker index 106c81e..16f79df 100644 --- a/.github/workflows/py3_kern6.docker +++ b/.github/workflows/py3_kern6.docker @@ -13,8 +13,8 @@ RUN docker-apt-install \ python3-six \ python3-pip \ python3-nose -ADD . /code -WORKDIR /code +ADD . /src +WORKDIR /src RUN pip3 install -e . RUN pip3 install -r tests/requirements.txt RUN nosetests3 --with-coverage --verbose --cover-package=casacore From c9c1eb8be90110d349ec32ccd6adf9d58db898c2 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:39:53 +0100 Subject: [PATCH 45/48] WIP: Bump MacOS version; 10.15 is no longer supported --- .github/workflows/osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 61e1165..57c766e 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -9,7 +9,7 @@ on: jobs: osx: - runs-on: macos-10.15 + runs-on: macos-11 continue-on-error: true steps: From 72a7edf04bf5ba6a68ccd174b79ff1c88a41a7ad Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:42:24 +0100 Subject: [PATCH 46/48] WIP: Bump MacOS version to latest --- .github/workflows/osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 57c766e..77a4adf 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -9,7 +9,7 @@ on: jobs: osx: - runs-on: macos-11 + runs-on: macos-latest continue-on-error: true steps: From 5ead41a642204992e42175891cf2d7335febcb29 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 21:43:14 +0100 Subject: [PATCH 47/48] Revert "WIP: Bump MacOS version to latest" This reverts commit 72a7edf04bf5ba6a68ccd174b79ff1c88a41a7ad. --- .github/workflows/osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 77a4adf..57c766e 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -9,7 +9,7 @@ on: jobs: osx: - runs-on: macos-latest + runs-on: macos-11 continue-on-error: true steps: From 282065573c8258dee3975de161726e2fac6bd02f Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Mon, 12 Feb 2024 22:17:02 +0100 Subject: [PATCH 48/48] WIP: Fix wheel build: temporarily allow overwriting of generated wheels --- .github/workflows/build_release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 3978b87..7012acb 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -41,7 +41,9 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl - # overwrite: true # Only use when testing! + # Temporary allow overwrite until we use setuptools_scm to + # generate unique version numbers on every push + overwrite: true upload_pypi: name: Upload release to PyPI