update requirements and environment files

- Update pypatchmatch to 0.1.5 (see request from @Kyle0654 here
  https://discord.com/channels/1020123559063990373/1034740515209486387/1052465462757310464 )

- Removed basicsrs workaround for environment files, now that we know
  problem was caused by Windows long path issue.

Author: lstein

environments-and-requirements/environment-lin-aarch64.yml

@@ -32,6 +32,7 @@ dependencies:
   - pip:
       - dependency_injector==4.40.0
       - getpass_asterisk
+      - gfpgan==1.3.8
       - omegaconf==2.1.1
       - picklescan
       - pyreadline3
@@ -41,6 +42,5 @@ dependencies:
       - 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.4#egg=pypatchmatch
+      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
       - -e .

environments-and-requirements/environment-lin-amd.yml

@@ -18,6 +18,7 @@ dependencies:
     - flask_cors==3.0.10
     - flask_socketio==5.3.0
     - getpass_asterisk
+    - gfpgan==1.3.8
     - imageio-ffmpeg==0.4.2
     - imageio==2.9.0
     - kornia==0.6.0
@@ -43,6 +44,5 @@ dependencies:
     - 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.4#egg=pypatchmatch
+    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
     - -e .

environments-and-requirements/environment-lin-cuda.yml

@@ -21,6 +21,7 @@ dependencies:
     - flask_cors==3.0.10
     - flask_socketio==5.3.0
     - getpass_asterisk
+    - gfpgan==1.3.8
     - imageio-ffmpeg==0.4.2
     - imageio==2.9.0
     - kornia==0.6.0
@@ -42,6 +43,5 @@ dependencies:
     - 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.4#egg=pypatchmatch
+    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
     - -e .

environments-and-requirements/environment-mac.yml

@@ -25,10 +25,11 @@ dependencies:
   - diffusers=0.6
   - einops=0.3
   - eventlet
-  - grpcio=1.46
   - flask=2.1
   - flask-socketio=5.3
   - flask-cors=3.0
+  - gfpgan==1.3.8
+  - grpcio=1.46
   - humanfriendly=10.0
   - imageio=2.21
   - imageio-ffmpeg=0.4
@@ -58,8 +59,7 @@ dependencies:
       - 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.4#egg=pypatchmatch
+      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
       - -e .
 variables:
   PYTORCH_ENABLE_MPS_FALLBACK: 1

environments-and-requirements/environment-win-cuda.yml

@@ -21,6 +21,7 @@ dependencies:
     - flask_cors==3.0.10
     - flask_socketio==5.3.0
     - getpass_asterisk
+    - gfpgan==1.3.8
     - imageio-ffmpeg==0.4.2
     - imageio==2.9.0
     - kornia==0.6.0
@@ -42,6 +43,5 @@ dependencies:
     - 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.1#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
+    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
     - -e .

environments-and-requirements/requirements-base.txt

@@ -35,6 +35,6 @@ torch-fidelity
 torchmetrics
 transformers==4.25.*
 https://github.com/Birch-san/k-diffusion/archive/refs/heads/mps.zip#egg=k-diffusion
-https://github.com/invoke-ai/PyPatchMatch/archive/refs/tags/0.1.4.zip#egg=pypatchmatch
+https://github.com/invoke-ai/PyPatchMatch/archive/refs/tags/0.1.5.zip#egg=pypatchmatch
 https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip#egg=clip
 https://github.com/invoke-ai/clipseg/archive/relaxed-python-requirement.zip#egg=clipseg