Merge branch 'main' of github.com:invoke-ai/InvokeAI into main

move getpass_asterisk from conda dependency to pip dependency
- Addresses Issue #1354
2026-01-21 01:48:13 -05:00 · 2022-11-03 06:52:17 -04:00 · 2022-11-03 06:51:34 -04:00 · 2022-11-03 00:32:49 -04:00 · 2022-11-03 00:19:57 -04:00
4 changed files with 6 additions and 10 deletions
--- a/docs/index.md
+++ b/docs/index.md
@@ -162,9 +162,7 @@ cleanup, testing, or code reviews, is very much encouraged to do so. If you are
 to contribute to GitHub projects, here is a
 [Getting Started Guide](https://opensource.com/article/19/7/create-pull-request-github).

-A full set of contribution guidelines, along with templates, are in progress, but for now the most
-important thing is to **make your pull request against the "development" branch**, and not against
-"main". This will help keep public breakage to a minimum and will allow you to propose more radical
+The most important thing is to know about contributing code is to **make your pull request against the "development" branch**, and not against "main". This will help keep public breakage to a minimum and will allow you to propose more radical
 changes.

 ## :octicons-person-24: Contributors
@@ -175,10 +173,9 @@ time, hard work and effort.

 ## :octicons-question-24: Support

-For support, please use this repository's GitHub Issues tracking service. Feel free to send me an
-email if you use and like the script.
+For support, please use this repository's GitHub [Issues tracking service](https://github.com/invoke-ai/InvokeAI/issues). Live support is also available on the [InvokeAI Discord server](https://discord.gg/ZmtBAhwWhy).

-Original portions of the software are Copyright (c) 2020
+Original portions of the software are Copyright (c) 2022
 [Lincoln D. Stein](https://github.com/lstein)

 ## :octicons-book-24: Further Reading
--- a/environment-mac.yml
+++ b/environment-mac.yml
@@ -22,7 +22,6 @@ dependencies:
  - diffusers=0.6.0
  - einops=0.4.1
  - grpcio=1.46.4
-  - getpass_asterisk
  - humanfriendly=10.0
  - imageio=2.21.2
  - imageio-ffmpeg=0.4.7
@@ -52,6 +51,7 @@ dependencies:
  - transformers=4.23.1
  - torch-fidelity=0.3.0
  - pip:
+      - getpass_asterisk
      - dependency_injector==4.40.0
      - realesrgan==0.2.5.0
      - test-tube==0.7.5
--- a/installer/install.bat
+++ b/installer/install.bat
@@ -72,8 +72,7 @@ if not exist ".git" (
    call git init
    call git remote add origin %REPO_URL%
    call git fetch
-#    call git checkout origin/main -ft
-    call git checkout origin/release-candidate-2-1 -ft
+    call git checkout origin/main -ft
 )

@rem activate the base env
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -87,7 +87,7 @@ if [ ! -e ".git" ]; then
    git init
    git remote add origin "$REPO_URL"
    git fetch
-    git checkout origin/release-candidate-2-1 -ft
+    git checkout origin/main -ft
 fi

 # create the environment
Author	SHA1	Message	Date
Lincoln Stein	0ca842ad87	Merge branch 'main' of github.com:invoke-ai/InvokeAI into main	2022-11-03 06:52:17 -04:00
Lincoln Stein	12e7e6e8df	move getpass_asterisk from conda dependency to pip dependency - Addresses Issue #1354	2022-11-03 06:51:34 -04:00
Lincoln Stein	152b7fc2bc	fix up branch that 1-click installers will pull from	2022-11-03 00:32:49 -04:00
Lincoln Stein	4bb6c8180e	Update index.md	2022-11-03 00:19:57 -04:00