Skip to content
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

pin version of recent breaking updates in dependencies #166

Merged
merged 16 commits into from
Feb 9, 2024
Merged
31 changes: 20 additions & 11 deletions .github/workflows/ingestion-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ jobs:
python-version: ["3.9"]

steps:
# - uses: actions/checkout@v4
- name: Download Conda YAML file
run: curl -o pipeline_env.yaml https://raw.githubusercontent.com/DendrouLab/panpipes/kra-gha/pipeline_env.yaml
- uses: actions/checkout@v4

- name: File tree
if: env.debug == 'true'
run: tree

- uses: conda-incubator/setup-miniconda@v3
with:
Expand All @@ -33,8 +35,14 @@ jobs:
channels: conda-forge
channel-priority: strict
activate-environment: pipeline_env
environment-file: pipeline_env.yaml # consider moving to etc/pipeline_env.yaml
environment-file: pipeline_env.yaml

- name: Install Panpipes
shell: bash -el {0}
run: |
pip install -e .
conda list

- name: Conda info
if: env.debug == 'true'
shell: bash -el {0}
Expand All @@ -45,11 +53,6 @@ jobs:
shell: pwsh
run: conda list

#- name: Run tests
# shell: bash -el {0}
# run: |
# python -m pytest tests/

# Note: all three files are renamed during the download to trim the "subsample_" prefix
- name: Preparing the data
run: |
Expand Down Expand Up @@ -89,7 +92,7 @@ jobs:

- name: File tree
if: env.debug == 'true'
run: tree
run: tree teaseq

- name: Review pipeline tasks
shell: bash -el {0}
Expand All @@ -105,4 +108,10 @@ jobs:

- name: File tree
if: env.debug == 'true'
run: tree
run: tree teaseq

- uses: actions/upload-artifact@v4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, this is the ingestion action, why is there an "ingested" object already?

with:
name: teaseq_unfilt.h5mu
path: teaseq/ingest/teaseq_unfilt.h5mu
retention-days: 1
1 change: 0 additions & 1 deletion pipeline_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ dependencies:
- r-xtable
- pip
- pip:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need both pipeline_env.yml and ingestion-CI to pin the versions?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the pins from the yml

- panpipes[spatial]
- pytest
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@ dependencies = [
"cgatcore",
"drmaa",
"gevent",
"harmonypy",
"harmonypy",
"jax<=0.4.23",
"jaxlib<=0.4.23",
"leidenalg",
"louvain",
"matplotlib<=3.7.3",
"mofapy2",
"mudata>=0.2.1",
"muon",
"numpy>=1.22.4",
"numpy==1.22.4",
"openpyxl",
"packaging",
"pandas>=1.0",
Expand Down
232 changes: 0 additions & 232 deletions requirements.txt

This file was deleted.