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..a735b04 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -7,14 +7,16 @@ jobs: name: Build and publish Python distribution to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@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 - 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.3.0 + uses: pypa/gh-action-pypi-publish@v1.8.14 with: password: ${{ secrets.PYPI_PASSWORD }} 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"]