Update-requirements and test-invoke-pip workflow (#1574)

* update requirements files * update test-invoke-pip workflow
invoke-ai · Nov 27, 2022 · 12eff0d · 12eff0d
1 parent f2d2a49
commit 12eff0d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
@@ -79,9 +79,7 @@ jobs:
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
       - name: install requirements
-        run: |
-          ${{ env.pythonLocation }}/bin/pip install --upgrade -r '${{ matrix.requirements-file }}'
-          ${{ env.pythonLocation }}/bin/pip install -e .
+        run: ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
@@ -35,5 +35,4 @@ picklescan
 git+https://github.com/openai/CLIP.git@main#egg=clip
 git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
 git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
-git+https://github.com/invoke-ai/[email protected]#egg=pypatchmatch
+git+https://github.com/invoke-ai/[email protected]#egg=pypatchmatch
diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt
@@ -1,5 +1,7 @@
 -r environments-and-requirements/requirements-base.txt
 
+git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
+
 # Get hardware-appropriate torch/torchvision
 --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org
 torch

diff --git a/environments-and-requirements/requirements-lin-arm64.txt b/environments-and-requirements/requirements-lin-arm64.txt
@@ -1,3 +1,6 @@
 --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
+
+git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
+
 -r environments-and-requirements/requirements-base.txt
 -e .
diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt
@@ -1,2 +1,3 @@
 -r environments-and-requirements/requirements-base.txt
-# -e .
+git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
+-e .
diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt
@@ -1,7 +1,7 @@
 -r environments-and-requirements/requirements-base.txt
-
+git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
 grpcio<1.51.0
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0
-# -e .
+-e .
diff --git a/environments-and-requirements/requirements-win-colab-cuda.txt b/environments-and-requirements/requirements-win-colab-cuda.txt
@@ -1,6 +1,6 @@
 -r environments-and-requirements/requirements-base.txt
-
-# Get hardware-appropriate torch/torchvision 
+git+https://github.com/invoke-ai/[email protected]#egg=gfpgan
+# Get hardware-appropriate torch/torchvision
 --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org
 basicsr==1.4.1
 torch==1.12.1