merge main

mims-harvard · Aug 6, 2024 · 54228df · 54228df
2 parents 9852f77 + 1a47468
commit 54228df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/.github/workflows/conda-tests.yml b/.github/workflows/conda-tests.yml
@@ -8,9 +8,6 @@ on:
   push:
     branches:
       - main
-      - avelez-cellxgene-dev
-      - avelez-dev
-      - avelez-cellxgene-dev
       - '*'
   pull_request:
     branches: [ "main" ]
@@ -36,7 +33,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           miniconda-version: "latest"
-          channels: bioconda, conda-forge, defaults
+          channels: bioconda, conda-forge, defaults, dgl
           use-only-tar-bz2: true  
           auto-update-conda: true
           auto-activate-base: true

diff --git a/environment.yml b/environment.yml
@@ -3,14 +3,10 @@ channels:
   - bioconda
   - conda-forge
   - defaults
-  - dglteam
-  - pyg
-  - pytorch
 dependencies:
   - anndata=0.6.22
   - biopython=1.78
   - dataclasses=0.8
-  - dgl=2.1.0
   - fuzzywuzzy=0.18.0
   - huggingface_hub=0.20.3
   - mygene=3.2.2
@@ -19,22 +15,15 @@ dependencies:
   - python=3.9.13
   - pip=23.3.1
   - pandas=2.1.4
-  - pyg=2.5.0
-  - pytorch=2.2.1
-  - pyg=2.5.0
-  - pytorch=2.2.1
   - requests=2.31.0
   - scikit-learn=1.2.2
   - seaborn=0.12.2
   - tqdm=4.65.0
-  - torchaudio=2.2.1
-  - torchvision=0.17.1
-  - torchaudio=2.2.1
-  - torchvision=0.17.1
   - pip:
     - accelerate==0.33.0
-    - cellxgene-census==1.10.2 
+    - cellxgene-census==1.15.0 
     - datasets==2.20.0
+    - dgl==1.1.3
     - evaluate==0.4.2
     - gget==0.28.4
     - pydantic==2.6.3
@@ -44,8 +33,12 @@ dependencies:
     - pydantic==2.6.3
     - pytest==8.3.2
     - rdkit==2023.9.5
-    - tiledbsoma==1.7.2
-    - transformers==4.43.3
+    - tiledbsoma==1.11.4
+    - torch==2.1.1
+    - torch_geometric==2.5.3
+    - torchvision==0.16.1
+    - transformers==4.43.4
     - yapf==0.40.2
+
 variables:
   KMP_DUPLICATE_LIB_OK: "TRUE"
diff --git a/requirements.txt b/requirements.txt
@@ -10,12 +10,11 @@ numpy>=1.26.4,<2.0.0
 openpyxl>=3.0.10,<4.0.0
 pandas>=2.1.4,<3.0.0
 requests>=2.31.0,<3.0.0
-# scikit-learn>=1.2.2,<2.0.0
 scikit-learn==1.2.2
 seaborn>=0.12.2,<1.0.0
 tqdm>=4.65.0,<5.0.0
-transformers==4.43.3
-cellxgene-census>=1.10.2,<2.0.0
+transformers==4.43.4
+cellxgene-census==1.15.0
 gget>=0.28.4,<1.0.0
 pydantic>=2.6.3,<3.0.0
 rdkit>=2023.9.5,<2024.3.1