From a3a98016aa0695d9964934e868347453769133c4 Mon Sep 17 00:00:00 2001 From: Erick Martins Ratamero Date: Mon, 22 Jan 2024 12:48:11 -0500 Subject: [PATCH] updated omero-py version (#94) * updated omero-py version * fix typo in docstring because why not * using glencoe's zeroc-ice * it's installing too fast (!!!) now --- .github/workflows/run_tests_pr.yml | 50 +++++++++---------- .github/workflows/run_tests_push.yml | 72 ++++++++++++++-------------- ezomero/_posts.py | 2 +- setup.py | 54 ++++++++++----------- 4 files changed, 91 insertions(+), 87 deletions(-) diff --git a/.github/workflows/run_tests_pr.yml b/.github/workflows/run_tests_pr.yml index 6e65ee6..68b0cef 100644 --- a/.github/workflows/run_tests_pr.yml +++ b/.github/workflows/run_tests_pr.yml @@ -1,24 +1,26 @@ -name: Run Tests on PR -on: pull_request -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run docker compose up - run: docker-compose -f tests/docker-compose.yml up -d - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flake8 pytest - pip install .[tables] - - name: Test with pytest - run: | - pytest tests/ - - +name: Run Tests on PR +on: pull_request +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Run docker compose up + run: docker-compose -f tests/docker-compose.yml up -d + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20231130/zeroc_ice-3.6.5-cp38-cp38-manylinux_2_28_x86_64.whl + pip install .[tables] + sleep 60 + - name: Test with pytest + run: | + pytest tests/ + + diff --git a/.github/workflows/run_tests_push.yml b/.github/workflows/run_tests_push.yml index 090bda7..ad42f0a 100644 --- a/.github/workflows/run_tests_push.yml +++ b/.github/workflows/run_tests_push.yml @@ -1,35 +1,37 @@ -name: Run Tests on push -on: - push: - branches: [ main ] -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Run docker compose up - run: docker-compose -f tests/docker-compose.yml up -d - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flake8 pytest - pip install .[tables] - - name: Test with pytest and generate coverage report/badge - run: | - pip install coverage coverage-badge - coverage run -m pytest tests/ - coverage report -i - coverage-badge -f -o coverage.svg - - name: Commit badge - run: | - git config --global user.name 'Erick Ratamero' - git config --global user.email 'erickmartins@users.noreply.github.com' - git add coverage.svg - git commit --allow-empty -am "Automated updating coverage badge" - git push - +name: Run Tests on push +on: + push: + branches: [ main ] +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Run docker compose up + run: docker-compose -f tests/docker-compose.yml up -d + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20231130/zeroc_ice-3.6.5-cp38-cp38-manylinux_2_28_x86_64.whl + pip install .[tables] + sleep 60 + - name: Test with pytest and generate coverage report/badge + run: | + pip install coverage coverage-badge + coverage run -m pytest tests/ + coverage report -i + coverage-badge -f -o coverage.svg + - name: Commit badge + run: | + git config --global user.name 'Erick Ratamero' + git config --global user.email 'erickmartins@users.noreply.github.com' + git add coverage.svg + git commit --allow-empty -am "Automated updating coverage badge" + git push + diff --git a/ezomero/_posts.py b/ezomero/_posts.py index 1dde243..86d746c 100644 --- a/ezomero/_posts.py +++ b/ezomero/_posts.py @@ -423,7 +423,7 @@ def post_file_annotation(conn: BlitzGateway, Returns ------- file_ann_id : int - IDs of newly created MapAnnotation + IDs of newly created FileAnnotation Examples -------- diff --git a/setup.py b/setup.py index 8bd9188..3c6d141 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,27 @@ -import setuptools -import os - -with open("README.md", "r") as fh: - long_description = fh.read() - -setuptools.setup( - name="ezomero", - version=os.environ.get('VERSION', '0.0.0'), - maintainer="Dave Mellert", - maintainer_email="Dave.Mellert@jax.org", - description=("A suite of convenience functions for working" - " with OMERO. Written and maintained by the " - "Research IT team at The Jackson Laboratory."), - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/TheJacksonLaboratory/ezomero", - packages=setuptools.find_packages(), - install_requires=[ - 'omero-py == 5.16.1', - 'numpy >= 1.22, < 2.0' - ], - extras_require={ - "tables": ["pandas"], - }, - python_requires='>=3.8' -) +import setuptools +import os + +with open("README.md", "r") as fh: + long_description = fh.read() + +setuptools.setup( + name="ezomero", + version=os.environ.get('VERSION', '0.0.0'), + maintainer="Dave Mellert", + maintainer_email="Dave.Mellert@jax.org", + description=("A suite of convenience functions for working" + " with OMERO. Written and maintained by the " + "Research IT team at The Jackson Laboratory."), + long_description=long_description, + long_description_content_type="text/markdown", + url="https://github.com/TheJacksonLaboratory/ezomero", + packages=setuptools.find_packages(), + install_requires=[ + 'omero-py == 5.18.0', + 'numpy >= 1.22, < 2.0' + ], + extras_require={ + "tables": ["pandas"], + }, + python_requires='>=3.8' +)