From 1d3942dbaf01ca8da484b5b269d924f05177552f Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 14:41:35 +0000 Subject: [PATCH 1/5] Bump actions/checkout to v4 --- .github/workflows/omero_plugin.yml | 2 +- .github/workflows/publish_pypi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/omero_plugin.yml b/.github/workflows/omero_plugin.yml index c14163c..62f0fb7 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -23,7 +23,7 @@ jobs: env: STAGE: app steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Checkout omero-test-infra uses: actions/checkout@master with: diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 81eccda..436eafb 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -7,7 +7,7 @@ jobs: name: Build and publish Python distribution to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 - name: Build a binary wheel and a source tarball run: | From 59c4d2ad79d859746d2d2867e029e9646e0a16aa Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 14:41:56 +0000 Subject: [PATCH 2/5] Bump actions/setup-python to v5 --- .github/workflows/publish_pypi.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 436eafb..3781dfa 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -8,7 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Build a binary wheel and a source tarball run: | python -mpip install wheel From 5cd6f382339f23d4a2359a87950195952d6e7797 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 14:42:10 +0000 Subject: [PATCH 3/5] Bump pypa/gh-action-pypi-publish to 1.8.14 --- .github/workflows/publish_pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 3781dfa..666ed3d 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -17,6 +17,6 @@ jobs: python setup.py sdist bdist_wheel - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@v1.3.0 + uses: pypa/gh-action-pypi-publish@v1.8.14 with: password: ${{ secrets.PYPI_PASSWORD }} From c6fe77bb0c3ea08e70fa5118451efdddadd89e29 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 14:42:33 +0000 Subject: [PATCH 4/5] Use build instead of sdist --- .github/workflows/publish_pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 666ed3d..a735b04 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -13,8 +13,8 @@ jobs: python-version: '3.10' - name: Build a binary wheel and a source tarball run: | - python -mpip install wheel - python setup.py sdist bdist_wheel + python -mpip install build + python -m build - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@v1.8.14 From d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 22 Nov 2024 08:32:39 +0000 Subject: [PATCH 5/5] Disable tests --- .omeroci/app-build | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 .omeroci/app-build diff --git a/.omeroci/app-build b/.omeroci/app-build new file mode 100755 index 0000000..3992193 --- /dev/null +++ b/.omeroci/app-build @@ -0,0 +1,19 @@ +#!/bin/bash + +source /infra/utils + +set -e +set -u +set -x + +cd $TARGET +DIR=$(setup_dir) + +export DJANGO_SETTINGS_MODULE=omeroweb.settings +export OMERODIR=/opt/omero/web/OMERO.web +export ICE_CONFIG=${OMERO_DIST}/etc/ice.config + +if [ -e test ]; then + echo Tests currently disabled + exit 1 +fi