Skip to content

ci: fix broken workflow & upgrade dependencies #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.7"
python-version: "3.10"
- name: Pin pip version
run: python -m pip install --upgrade "pip<24.1"
- name: Install requirements
run: |
pip install .
Expand All @@ -35,15 +37,17 @@ jobs:
- name: Check out repository
uses: actions/checkout@v3
- name: Deploy app
run: docker-compose up -d --build
run: docker compose up -d --build
- name: Wait for app startup
shell: bash
run: sleep 20
run: |
sleep 20
docker compose ps
- name: Run integration tests
shell: bash
run: bash tests/integration_tests.sh
- name: Tear down app
run: docker-compose down
run: docker compose down
publish:
name: Build and publish app image
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM elixircloud/foca:20221110-py3.7
FROM elixircloud/foca:20240711-py3.12

LABEL version="2.0"
LABEL software="cwl-WES"
Expand Down
1 change: 1 addition & 0 deletions cwl_wes/tasks/workflow_run_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ def update_run_document( # pylint: disable=too-many-branches
task_logs: Task run logs.
**run_log_params: Run log parameters.
"""
document = None
# TODO: Minimize db ops; try to compile entire object & update once
# Update internal parameters
if internal:
Expand Down
6 changes: 4 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
foca~=0.12.0
foca==0.12.1
flask-authz==2.5.0
# cwl-tes @ git+https://github.com/ohsu-comp-bio/cwl-tes.git@7b44cb1825a302bb7eccb3f2d91dc233adc0e32f#egg=cwl-tes
drs-cli~=0.2.3
gunicorn~=19.9.0
gunicorn~=22.0
py-tes~=0.4.2
importlib-metadata==4.13.0
yq==3.2.3
setuptools<69
4 changes: 2 additions & 2 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
black~=22.12
flake8~=5.0
flake8~=7.0
flake8-docstrings~=1.6
mypy~=0.991
pylint~=2.15
pylint==3.2.6
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Natural Language :: English",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.12",
],
install_requires=INSTALL_REQUIRES,
)
Loading