From 1584f38c85975ece1a9bbf98e52f48f302e638c0 Mon Sep 17 00:00:00 2001 From: Jakob Drefs Date: Thu, 14 Jul 2022 11:13:03 +0200 Subject: [PATCH 1/4] [CI] Switch to pip for creating tvo conda env --- .github/workflows/docs.yml | 5 ++++- .github/workflows/test.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f54393f9..13e65261 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,10 @@ jobs: # $CONDA is an environment variable pointing to the root of the miniconda directory echo $CONDA/bin >> $GITHUB_PATH - name: Create the tvo conda env - run: conda env create + run: | + conda create -n tvo python==3.8 + conda activate tvo + pip install -r requirements.txt - name: Generate docs run: | source $CONDA/etc/profile.d/conda.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0fcd1c4..f84bf2c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,10 @@ jobs: # $CONDA is an environment variable pointing to the root of the miniconda directory echo $CONDA/bin >> $GITHUB_PATH - name: Create the tvo conda env - run: conda env create + run: | + conda create -n tvo python==3.8 + conda activate tvo + pip install -r requirements.txt - name: Check formatting with black run: | source $CONDA/etc/profile.d/conda.sh From aaa33346879632ec7973ee57fe733dc124eed911 Mon Sep 17 00:00:00 2001 From: Jakob Drefs Date: Thu, 14 Jul 2022 11:13:11 +0200 Subject: [PATCH 2/4] [CI] Remove environment.yml after switching to pip --- environment.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 environment.yml diff --git a/environment.yml b/environment.yml deleted file mode 100644 index de4ea623..00000000 --- a/environment.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: tvo -channels: - - pytorch - - conda-forge -dependencies: - - python>=3.8 - - numpy - - pytorch>=1.8.1 - - torchvision - - cudatoolkit>=10.0 - - matplotlib - - h5py - - pylama - - pytest - - mypy - - pytest-cov - - black>=21 - - munch - - cython - - gcc_linux-64 From 279366a723cd5b77b59e96e12b68e2030c740ae0 Mon Sep 17 00:00:00 2001 From: Jakob Drefs Date: Thu, 14 Jul 2022 11:44:44 +0200 Subject: [PATCH 3/4] [CI] Fix conda activation --- .github/workflows/docs.yml | 1 + .github/workflows/test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 13e65261..9df3be54 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,6 +22,7 @@ jobs: - name: Create the tvo conda env run: | conda create -n tvo python==3.8 + source $CONDA/etc/profile.d/conda.sh conda activate tvo pip install -r requirements.txt - name: Generate docs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f84bf2c6..a76142d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ jobs: - name: Create the tvo conda env run: | conda create -n tvo python==3.8 + source $CONDA/etc/profile.d/conda.sh conda activate tvo pip install -r requirements.txt - name: Check formatting with black From 6f93b4904b471d530796c2998d54eb495e29767a Mon Sep 17 00:00:00 2001 From: jdrefs Date: Thu, 14 Jul 2022 12:09:31 +0200 Subject: [PATCH 4/4] [CI] Install gcc on environment creation --- .github/workflows/docs.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9df3be54..4985ba96 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,7 +21,7 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Create the tvo conda env run: | - conda create -n tvo python==3.8 + conda create -n tvo python==3.8 gcc_linux-64 source $CONDA/etc/profile.d/conda.sh conda activate tvo pip install -r requirements.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a76142d7..a7142688 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Create the tvo conda env run: | - conda create -n tvo python==3.8 + conda create -n tvo python==3.8 gcc_linux-64 source $CONDA/etc/profile.d/conda.sh conda activate tvo pip install -r requirements.txt