forked from ArchipelagoMW/Archipelago
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/main' into per_game_datapackage
# Conflicts: # CommonClient.py # Utils.py # WebHostLib/static/styles/tracker.css # WebHostLib/templates/genericTracker.html # WebHostLib/templates/multitracker.html # WebHostLib/templates/multitrackerNavigation.html # WebHostLib/templates/multitracker__ALinkToThePast.html # WebHostLib/templates/multitracker__Factorio.html # WebHostLib/templates/tracker__ALinkToThePast.html # WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html # WebHostLib/tracker.py # docs/adding games.md # docs/network protocol.md # docs/options api.md # docs/world api.md # worlds/AutoWorld.py # worlds/__init__.py # worlds/alttp/__init__.py # worlds/kh2/__init__.py # worlds/lufia2ac/__init__.py # worlds/messenger/__init__.py # worlds/noita/__init__.py # worlds/ror2/__init__.py # worlds/sa2b/__init__.py # worlds/sc2wol/__init__.py # worlds/sm64ex/__init__.py # worlds/smw/__init__.py # worlds/soe/__init__.py # worlds/stardew_valley/__init__.py # worlds/subnautica/__init__.py # worlds/timespinner/__init__.py # worlds/witness/__init__.py
- Loading branch information
Showing
1,560 changed files
with
190,354 additions
and
36,215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [report] | ||
| exclude_lines = | ||
| pragma: no cover | ||
| if TYPE_CHECKING: | ||
| if typing.TYPE_CHECKING: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| 'is: documentation': | ||
| - changed-files: | ||
| - all-globs-to-all-files: '{**/docs/**,**/README.md}' | ||
|
|
||
| 'affects: webhost': | ||
| - changed-files: | ||
| - all-globs-to-any-file: 'WebHost.py' | ||
| - all-globs-to-any-file: 'WebHostLib/**/*' | ||
|
|
||
| 'affects: core': | ||
| - changed-files: | ||
| - all-globs-to-any-file: | ||
| - '!*Client.py' | ||
| - '!README.md' | ||
| - '!LICENSE' | ||
| - '!*.yml' | ||
| - '!.gitignore' | ||
| - '!**/docs/**' | ||
| - '!typings/kivy/**' | ||
| - '!test/**' | ||
| - '!data/**' | ||
| - '!.run/**' | ||
| - '!.github/**' | ||
| - '!worlds_disabled/**' | ||
| - '!worlds/**' | ||
| - '!WebHost.py' | ||
| - '!WebHostLib/**' | ||
| - any-glob-to-any-file: # exceptions to the above rules of "stuff that isn't core" | ||
| - 'worlds/generic/**/*.py' | ||
| - 'worlds/*.py' | ||
| - 'CommonClient.py' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "include": [ | ||
| "type_check.py", | ||
| "../worlds/AutoSNIClient.py", | ||
| "../Patch.py" | ||
| ], | ||
|
|
||
| "exclude": [ | ||
| "**/__pycache__" | ||
| ], | ||
|
|
||
| "stubPath": "../typings", | ||
|
|
||
| "typeCheckingMode": "strict", | ||
| "reportImplicitOverride": "error", | ||
| "reportMissingImports": true, | ||
| "reportMissingTypeStubs": true, | ||
|
|
||
| "pythonVersion": "3.8", | ||
| "pythonPlatform": "Windows", | ||
|
|
||
| "executionEnvironments": [ | ||
| { | ||
| "root": ".." | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| from pathlib import Path | ||
| import subprocess | ||
|
|
||
| config = Path(__file__).parent / "pyright-config.json" | ||
|
|
||
| command = ("pyright", "-p", str(config)) | ||
| print(" ".join(command)) | ||
|
|
||
| try: | ||
| result = subprocess.run(command) | ||
| except FileNotFoundError as e: | ||
| print(f"{e} - Is pyright installed?") | ||
| exit(1) | ||
|
|
||
| exit(result.returncode) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Label Pull Request | ||
| on: | ||
| pull_request_target: | ||
| types: ['opened', 'reopened', 'synchronize', 'ready_for_review', 'converted_to_draft', 'closed'] | ||
| branches: ['main'] | ||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| labeler: | ||
| name: 'Apply content-based labels' | ||
| if: github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/labeler@v5 | ||
| with: | ||
| sync-labels: false | ||
| peer_review: | ||
| name: 'Apply peer review label' | ||
| needs: labeler | ||
| if: >- | ||
| (github.event.action == 'opened' || github.event.action == 'reopened' || | ||
| github.event.action == 'ready_for_review') && !github.event.pull_request.draft | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: 'Add label' | ||
| run: "gh pr edit \"$PR_URL\" --add-label 'waiting-on: peer-review'" | ||
| env: | ||
| PR_URL: ${{ github.event.pull_request.html_url }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| unblock_draft_prs: | ||
| name: 'Remove waiting-on labels' | ||
| needs: labeler | ||
| if: github.event.action == 'converted_to_draft' || github.event.action == 'closed' | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: 'Remove labels' | ||
| run: |- | ||
| gh pr edit "$PR_URL" --remove-label 'waiting-on: peer-review' \ | ||
| --remove-label 'waiting-on: core-review' \ | ||
| --remove-label 'waiting-on: world-maintainer' \ | ||
| --remove-label 'waiting-on: author' | ||
| env: | ||
| PR_URL: ${{ github.event.pull_request.html_url }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: Native Code Static Analysis | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - '**.c' | ||
| - '**.cc' | ||
| - '**.cpp' | ||
| - '**.cxx' | ||
| - '**.h' | ||
| - '**.hh' | ||
| - '**.hpp' | ||
| - '**.pyx' | ||
| - 'setup.py' | ||
| - 'requirements.txt' | ||
| - '.github/workflows/scan-build.yml' | ||
| pull_request: | ||
| paths: | ||
| - '**.c' | ||
| - '**.cc' | ||
| - '**.cpp' | ||
| - '**.cxx' | ||
| - '**.h' | ||
| - '**.hh' | ||
| - '**.hpp' | ||
| - '**.pyx' | ||
| - 'setup.py' | ||
| - 'requirements.txt' | ||
| - '.github/workflows/scan-build.yml' | ||
|
|
||
| jobs: | ||
| scan-build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install newer Clang | ||
| run: | | ||
| wget https://apt.llvm.org/llvm.sh | ||
| chmod +x ./llvm.sh | ||
| sudo ./llvm.sh 17 | ||
| - name: Install scan-build command | ||
| run: | | ||
| sudo apt install clang-tools-17 | ||
| - name: Get a recent python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.11' | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m venv venv | ||
| source venv/bin/activate | ||
| python -m pip install --upgrade pip -r requirements.txt | ||
| - name: scan-build | ||
| run: | | ||
| source venv/bin/activate | ||
| scan-build-17 --status-bugs -o scan-build-reports -disable-checker deadcode.DeadStores python setup.py build -y | ||
| - name: Store report | ||
| if: failure() | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: scan-build-reports | ||
| path: scan-build-reports |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: type check | ||
|
|
||
| on: | ||
| pull_request: | ||
| paths: | ||
| - "**.py" | ||
| - ".github/pyright-config.json" | ||
| - ".github/workflows/strict-type-check.yml" | ||
| - "**.pyi" | ||
| push: | ||
| paths: | ||
| - "**.py" | ||
| - ".github/pyright-config.json" | ||
| - ".github/workflows/strict-type-check.yml" | ||
| - "**.pyi" | ||
|
|
||
| jobs: | ||
| pyright: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.11" | ||
|
|
||
| - name: "Install dependencies" | ||
| run: | | ||
| python -m pip install --upgrade pip pyright==1.1.358 | ||
| python ModuleUpdate.py --append "WebHostLib/requirements.txt" --force --yes | ||
| - name: "pyright: strict check on specific files" | ||
| run: python .github/type_check.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.