Merge branch 'development' into model-import-fixes

.github/workflows/mkdocs-material.yml

@@ -22,7 +22,7 @@ jobs:
       - name: install requirements
         run: |
           python -m \
-            pip install -r requirements-mkdocs.txt
+            pip install -r docs/requirements-mkdocs.txt
 
       - name: confirm buildability
         run: |

.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: |
+        run: ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
-          ${{ env.pythonLocation }}/bin/pip install --upgrade -r '${{ matrix.requirements-file }}'
-          ${{ env.pythonLocation }}/bin/pip install -e .
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

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/GFPGAN@basicsr-1.4.2#egg=gfpgan
+git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch
-git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch

environments-and-requirements/requirements-lin-amd.txt

@@ -1,5 +1,7 @@
 -r environments-and-requirements/requirements-base.txt
 
+git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#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

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/GFPGAN@basicsr-1.4.2#egg=gfpgan
+
 -r environments-and-requirements/requirements-base.txt
 -e .

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/GFPGAN@basicsr-1.4.2#egg=gfpgan
+-e .

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/GFPGAN@basicsr-1.4.2#egg=gfpgan
 grpcio<1.51.0
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0
-# -e .
+-e .

environments-and-requirements/requirements-win-colab-cuda.txt

@@ -1,6 +1,6 @@
 -r environments-and-requirements/requirements-base.txt
-
+git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan
-# Get hardware-appropriate torch/torchvision 
+# 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

mkdocs.yml

@@ -12,7 +12,7 @@ repo_url: 'https://github.com/invoke-ai/InvokeAI'
 edit_uri: edit/main/docs/
 
 # Copyright
-copyright: Copyright &copy; 2022 Lincoln D. Stein <lincoln.stein@gmail.com>
+copyright: Copyright &copy; 2022 InvokeAI Team
 
 # Configuration
 theme: