From 08804581abdceda13c4bb15b915b91dd798a199e Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:03 +0000 Subject: [PATCH 1/7] 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 bb7248f..c2c4da4 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -23,7 +23,7 @@ jobs: env: STAGE: lib 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 8529fc46274f3f728829167e13e7df603cfc0396 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:22 +0000 Subject: [PATCH 2/7] 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 e332e19c82abd1492bc7845f77617a20e4c33be0 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:37 +0000 Subject: [PATCH 3/7] 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 b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:58 +0000 Subject: [PATCH 4/7] 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 f2814e1dcada296852e680ec8e6ff31c7e780e10 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 25 Nov 2024 17:24:45 +0000 Subject: [PATCH 5/7] Remove cap on prometheus-client --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cfacf56..35b8402 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ install_requires=[ 'omero-py>=5.6.0', # TODO: Update to current release 0.7.* - 'prometheus-client==0.2.*', + 'prometheus-client', 'PyYAML', ], python_requires='>=3', From ecf813e1040d442d9d5135b0a6b4e3143014680d Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Sun, 15 Dec 2024 22:49:26 +0000 Subject: [PATCH 6/7] Install from pypi --- Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4655ad..77f3259 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,20 @@ -FROM continuumio/miniconda3:4.7.12-alpine as builder +FROM continuumio/miniconda3:24.9.2-0 as builder USER root COPY . /omero-prometheus-tools/ RUN cd /omero-prometheus-tools/ && \ - /opt/conda/bin/python setup.py sdist bdist_wheel + /opt/conda/bin/python -mpip install build && \ + /opt/conda/bin/python -m build ###################################################################### -FROM continuumio/miniconda3:4.7.12-alpine +FROM continuumio/miniconda3:24.9.2-0 # https://jcrist.github.io/conda-docker-tips.html -RUN /opt/conda/bin/conda install -y -q -c conda-forge omero-py nomkl +RUN /opt/conda/bin/pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp312-cp312-manylinux_2_28_x86_64.whl +RUN /opt/conda/bin/pip install omero-py +RUN /opt/conda/bin/conda install -y -q -c conda-forge nomkl + COPY --from=builder /omero-prometheus-tools/dist/*.whl . RUN /opt/conda/bin/pip install *.whl ENTRYPOINT ["/opt/conda/bin/omero-prometheus-tools.py"] From 4b5858111c12d80676fca034de598cba25f0673a Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 16 Dec 2024 10:09:04 +0000 Subject: [PATCH 7/7] Re-introduce cap --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 35b8402..cfacf56 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ install_requires=[ 'omero-py>=5.6.0', # TODO: Update to current release 0.7.* - 'prometheus-client', + 'prometheus-client==0.2.*', 'PyYAML', ], python_requires='>=3',