Skip to content

Commit

Permalink
remove defaults from conda envs (#52)
Browse files Browse the repository at this point in the history
* remove `defaults` from `conda` envs

Removing this channel fixes issue with Anaconda licensing.

* update `snakemake` version

* update version on GitHub actions in tests
  • Loading branch information
jbloom authored Oct 7, 2024
1 parent a5ab6e0 commit a6b34c9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
timeout-minutes: 60
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true

- name: build conda environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: seqneut-pipeline
environment-file: environment.yml
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
run: cd test_example && python test_titers_as_expected.py && cd ..

- name: upload results in case of error
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: results
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

#### version 3.1.3
- Remove `defaults` channel from `conda` envs to avoid issue with Anaconda licensing.
- Update `snakemake` version.

#### version 3.1.2
- Minor bug fix to resolve issue with specifying serum_replicates and barcode_serum_replicates to manual drops, similar issue resolved in 3.1.1. Addresses [this issue](https://github.com/jbloomlab/seqneut-pipeline/issues/49).

Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: seqneut-pipeline
channels:
- conda-forge
- bioconda
- defaults

dependencies:
- altair=5.2
Expand All @@ -18,7 +17,7 @@ dependencies:
- python=3.12
- ruamel.yaml=0.18.6
- snakefmt
- snakemake=8.10
- snakemake=8.20.6
- ruff
- pip:
- dms_variants==1.6.0
Expand Down
1 change: 0 additions & 1 deletion envs/count_barcodes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: seqneut-pipeline
channels:
- conda-forge
- bioconda
- defaults

dependencies:
- pandas=2.2
Expand Down

0 comments on commit a6b34c9

Please sign in to comment.