-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* updated omero-py version * fix typo in docstring because why not * using glencoe's zeroc-ice * it's installing too fast (!!!) now
- Loading branch information
1 parent
b09c18b
commit a3a9801
Showing
4 changed files
with
91 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 '[email protected]' | ||
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 '[email protected]' | ||
git add coverage.svg | ||
git commit --allow-empty -am "Automated updating coverage badge" | ||
git push | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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="[email protected]", | ||
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="[email protected]", | ||
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' | ||
) |