diff --git a/.github/workflows/mkdocs-flow.yml b/.github/workflows/mkdocs-flow.yml deleted file mode 100644 index 318f180c1b..0000000000 --- a/.github/workflows/mkdocs-flow.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Deploy -on: - push: - branches: - - main - # pull_request: - # branches: - # - main -jobs: - build: - name: Deploy docs to GitHub Pages - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Build - uses: Tiryoh/actions-mkdocs@v0 - with: - mkdocs_version: 'latest' # option - requirements: '/requirements-mkdocs.txt' # option - configfile: '/mkdocs.yml' # option - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./site diff --git a/.github/workflows/mkdocs-material.yml b/.github/workflows/mkdocs-material.yml index af03a524e9..2d01dec6df 100644 --- a/.github/workflows/mkdocs-material.yml +++ b/.github/workflows/mkdocs-material.yml @@ -4,7 +4,10 @@ on: branches: - 'main' - 'development' - - 'release-candidate-2-1' + pull_request: + branches: + - 'main' + - 'development' jobs: mkdocs-material: diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml index 4f39d86538..d758de8fdc 100644 --- a/.github/workflows/test-invoke-conda.yml +++ b/.github/workflows/test-invoke-conda.yml @@ -8,7 +8,6 @@ on: branches: - 'main' - 'development' - jobs: matrix: strategy: diff --git a/.gitignore b/.gitignore index 33f0de4df2..5086ff31ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ outputs/ models/ldm/stable-diffusion-v1/model.ckpt ldm/invoke/restoration/codeformer/weights - # ignore user models config configs/models.user.yaml config/models.user.yml @@ -184,7 +183,7 @@ src **/__pycache__/ outputs -# Logs and associated folders +# Logs and associated folders # created from generated embeddings. logs testtube diff --git a/environment-mac.yml b/environment-mac.yml index 0e0aae01ee..53e67a6854 100644 --- a/environment-mac.yml +++ b/environment-mac.yml @@ -5,10 +5,8 @@ channels: dependencies: - python=3.9.13 - pip=22.2.2 - - pytorch=1.12.1 - torchvision=0.13.1 - # I suggest to keep the other deps sorted for convenience. # To determine what the latest versions should be, run: # @@ -16,7 +14,6 @@ dependencies: # sed -E 's/invokeai/invokeai-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yml > environment-mac-updated.yml # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n invokeai-updated | awk ' {print " - " $1 "==" $2;} ' # ``` - - albumentations=1.2.1 - coloredlogs=15.0.1 - diffusers=0.6.0