From b38ae162aeb4db576bb9429a99c8288d4f45d141 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 5 Nov 2024 05:53:18 +0000 Subject: [PATCH 1/9] Bump action/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 df64496..c698d83 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -23,7 +23,7 @@ jobs: env: STAGE: cli steps: - - uses: actions/checkout@v2 + - 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 0838377..d177030 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@v2 + - uses: actions/checkout@v4 - uses: actions/setup-python@v2 - name: Build a binary wheel and a source tarball run: | From 17db7bac9f0e0c8d8993b2ca14f3387b5cc59cab Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 5 Nov 2024 05:54:07 +0000 Subject: [PATCH 2/9] 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 d177030..22d3a00 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@v2 + - uses: actions/setup-python@v5 + with: + python-version: '3.9' - name: Build a binary wheel and a source tarball run: | python -mpip install setuptools build wheel From d58fd42cd869696d434748ead2d248ee3c187af8 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 5 Nov 2024 06:16:03 +0000 Subject: [PATCH 3/9] Update 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 22d3a00..59c70be 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -17,6 +17,6 @@ jobs: 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 }} From c8348cf58a7e35523a75277875a971d63d0a2aa5 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 5 Nov 2024 06:18:14 +0000 Subject: [PATCH 4/9] Fix link --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 7d934f7..8824be1 100644 --- a/README.rst +++ b/README.rst @@ -1,11 +1,11 @@ .. image:: https://github.com/german-bioimaging/omero-rdf/workflows/OMERO/badge.svg - :target: https://github.com/german-bioimaging/omero-rdf + :target: https://github.com/german-bioimaging/omero-rdf/actions .. image:: https://badge.fury.io/py/omero-rdf.svg :target: https://badge.fury.io/py/omero-rdf omero-rdf -================================== +========= A plugin for exporting rdf from OMERO From 6f54737114e5772b9cf5e4d1baf698acb7dd8261 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 5 Nov 2024 07:04:39 +0000 Subject: [PATCH 5/9] Fix url --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 8824be1..3503fab 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -.. image:: https://github.com/german-bioimaging/omero-rdf/workflows/OMERO/badge.svg +.. image:: https://github.com/German-BioImaging/omero-rdf/workflows/OMERO/badge.svg :target: https://github.com/german-bioimaging/omero-rdf/actions .. image:: https://badge.fury.io/py/omero-rdf.svg From 338f927c7c95bdf39824c521aed6a884a8691808 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 5 Nov 2024 16:40:34 +0900 Subject: [PATCH 6/9] Temporarily disable isort see: https://github.com/python-poetry/poetry/issues/7426 https://github.com/PyCQA/isort/issues/2077 --- .pre-commit-config.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c831db6..fc38234 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,17 +1,6 @@ --- repos: - - repo: https://github.com/asottile/seed-isort-config - rev: v2.2.0 - hooks: - - id: seed-isort-config - - - repo: https://github.com/PyCQA/isort - rev: 5.10.1 - hooks: - - id: isort - args: ["--profile", "black"] - - repo: https://github.com/psf/black rev: 22.12.0 hooks: From 855e9121e944eb9a54048e7a4167dc62a9d3590a Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 5 Nov 2024 16:45:50 +0900 Subject: [PATCH 7/9] Fix formatting --- src/omero_rdf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/omero_rdf/__init__.py b/src/omero_rdf/__init__.py index a788716..7364d01 100644 --- a/src/omero_rdf/__init__.py +++ b/src/omero_rdf/__init__.py @@ -376,7 +376,7 @@ def descend( """ if isinstance(target, list): - return([self.descend(gateway, t, handler) for t in target]) + return [self.descend(gateway, t, handler) for t in target] elif isinstance(target, Screen): scr = self._lookup(gateway, "Screen", target.id) From fce6cae6082551358da07b817cf9de8906f541d4 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 5 Nov 2024 16:55:38 +0900 Subject: [PATCH 8/9] Try hard-coding project name --- .github/workflows/omero_plugin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/omero_plugin.yml b/.github/workflows/omero_plugin.yml index c698d83..5a494cd 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -22,6 +22,7 @@ jobs: runs-on: ubuntu-latest env: STAGE: cli + PROJECT: rdf steps: - uses: actions/checkout@v4 - name: Checkout omero-test-infra From 942f707119f23eebb68dbf043c5a8823d131688d Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 5 Nov 2024 17:29:42 +0900 Subject: [PATCH 9/9] Try 'PLUGIN' instead --- .github/workflows/omero_plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/omero_plugin.yml b/.github/workflows/omero_plugin.yml index 5a494cd..5c961df 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest env: STAGE: cli - PROJECT: rdf + PLUGIN: rdf steps: - uses: actions/checkout@v4 - name: Checkout omero-test-infra