Update master branch from develop

.github/workflows/docker-ci.yml

@@ -1,21 +1,23 @@
-name: Build and push Dockerfile
+name: Build and push Docker image
 
 # Only run if Dockerfile or docker-ci.yml changed
 on:
   push:
     paths:
-    - dockerfiles/**
-    - .github/workflows/docker-ci.yml
+      - dockerfiles/**
+      - uv.lock
+      - pyproject.toml
+      - .github/workflows/docker-ci.yml
   pull_request:
     branches:
-    - master
-    - develop
+      - master
+      - develop
 
 env:
-  VERSION_NUMBER: '1.0.2'
-  LATEST_PYTHON_VERSION: '3.11'
-  LATEST_SC2_VERSION: '4.10'
-  EXPERIMENTAL_PYTHON_VERSION: '3.11.0b1'
+  VERSION_NUMBER: "1.0.6"
+  LATEST_PYTHON_VERSION: "3.13"
+  LATEST_SC2_VERSION: "4.10"
+  EXPERIMENTAL_PYTHON_VERSION: "3.14"
 
 jobs:
   run_test_docker_image:
@@ -28,20 +30,19 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: Enable experimental docker features
-      run: |
-        echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker.service
+      - name: Enable experimental docker features
+        run: |
+          echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          sudo systemctl restart docker.service
 
-    - name: Run shell script
-      env:
-        VERSION_NUMBER: ${{ env.VERSION_NUMBER }}
-        PYTHON_VERSION: ${{ env.LATEST_PYTHON_VERSION }}
-        SC2_VERSION: ${{ env.LATEST_SC2_VERSION }}
-      run: |
-        sh dockerfiles/test_docker_image.sh
+      - name: Run shell script
+        env:
+          VERSION_NUMBER: ${{ env.VERSION_NUMBER }}
+          PYTHON_VERSION: ${{ env.LATEST_PYTHON_VERSION }}
+          SC2_VERSION: ${{ env.LATEST_SC2_VERSION }}
+        run: sh dockerfiles/test_docker_image.sh
 
   run_test_new_python_version:
     name: Run test_new_python_candidate.sh
@@ -53,21 +54,20 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Enable experimental docker features
-      run: |
-        echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker.service
-
-    - name: Run shell script
-      continue-on-error: true
-      env:
-        VERSION_NUMBER: ${{ env.VERSION_NUMBER }}
-        PYTHON_VERSION: ${{ env.EXPERIMENTAL_PYTHON_VERSION }}
-        SC2_VERSION: ${{ env.LATEST_SC2_VERSION }}
-      run: |
-        sh dockerfiles/test_new_python_candidate.sh
+      - uses: actions/checkout@v3
+
+      - name: Enable experimental docker features
+        run: |
+          echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          sudo systemctl restart docker.service
+
+      - name: Run shell script
+        continue-on-error: true
+        env:
+          VERSION_NUMBER: ${{ env.VERSION_NUMBER }}
+          PYTHON_VERSION: ${{ env.EXPERIMENTAL_PYTHON_VERSION }}
+          SC2_VERSION: ${{ env.LATEST_SC2_VERSION }}
+        run: sh dockerfiles/test_new_python_candidate.sh
 
   docker_build:
     name: Build docker image
@@ -77,62 +77,65 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        sc2-version: ['4.10']
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        sc2-version: ["4.10"]
     env:
       IMAGE_NAME: burnysc2/python-sc2-docker:py_${{ matrix.python-version }}-sc2_${{ matrix.sc2-version }}
       BUILD_ARGS: --build-arg PYTHON_VERSION=${{ matrix.python-version }} --build-arg SC2_VERSION=${{ matrix.sc2-version }}
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Build docker image
-      run: |
-        docker build -t $IMAGE_NAME-v$VERSION_NUMBER $BUILD_ARGS - < dockerfiles/Dockerfile
-
-    - name: Enable experimental docker features
-      run: |
-        echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker.service
-
-    - name: Build squashed image
-      run: |
-        docker build -t $IMAGE_NAME-v$VERSION_NUMBER-squashed --squash $BUILD_ARGS - < dockerfiles/Dockerfile
-
-    - name: Run test bots on squashed image
-      if: matrix.python-version != '3.7'
-      run: |
-        echo "Start container, override the default entrypoint"
-        docker run -i -d \
-          --name test_container \
-          --mount type=bind,source="$(pwd)",destination=/root/python-sc2,readonly \
-          --entrypoint /bin/bash \
-          $IMAGE_NAME-v$VERSION_NUMBER-squashed
-        echo "Install python-sc2"
-        docker exec -i test_container bash -c "pip install poetry \
-            && cd python-sc2 && poetry install --no-dev"
-        echo "Run various test bots"
-        docker exec -i test_container bash -c "cd python-sc2 && poetry run python test/travis_test_script.py test/autotest_bot.py"
-        docker exec -i test_container bash -c "cd python-sc2 && poetry run python test/run_example_bots_vs_computer.py"
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Upload docker image
-      if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
-      run: |
-        docker push $IMAGE_NAME-v$VERSION_NUMBER
-
-    - name: Upload squashed docker image
-      if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
-      run: |
-        docker push $IMAGE_NAME-v$VERSION_NUMBER-squashed
-
-    - name: Upload squashed docker image as latest tag
-      if: github.ref == 'refs/heads/develop' && github.event_name == 'push' && matrix.python-version == env.LATEST_PYTHON_VERSION && matrix.sc2-version == env.LATEST_SC2_VERSION
-      run: |
-        docker tag $IMAGE_NAME-v$VERSION_NUMBER-squashed burnysc2/python-sc2-docker:latest
-        docker push burnysc2/python-sc2-docker:latest
+      - uses: actions/checkout@v3
+
+      - name: Build docker image
+        run: docker build -t $IMAGE_NAME-v$VERSION_NUMBER $BUILD_ARGS - < dockerfiles/Dockerfile
+
+      - name: Enable experimental docker features
+        run: |
+          echo $'{\n    "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          sudo systemctl restart docker.service
+
+      - name: Build squashed image
+        run: docker build -t $IMAGE_NAME-v$VERSION_NUMBER-squashed --squash $BUILD_ARGS - < dockerfiles/Dockerfile
+
+      - name: Run test bots on squashed image
+        if: matrix.python-version != '3.7'
+        run: |
+          echo "Start container, override the default entrypoint"
+          docker run -i -d \
+            --name test_container \
+            --env 'PYTHONPATH=/root/python-sc2/' \
+            --entrypoint /bin/bash \
+            $IMAGE_NAME-v$VERSION_NUMBER-squashed
+          echo "Install python-sc2"
+          docker exec -i test_container mkdir -p /root/python-sc2
+          docker cp pyproject.toml test_container:/root/python-sc2/
+          docker cp uv.lock test_container:/root/python-sc2/
+          docker cp sc2 test_container:/root/python-sc2/sc2
+          docker cp test test_container:/root/python-sc2/test
+          docker cp examples test_container:/root/python-sc2/examples
+          docker exec -i test_container bash -c "pip install uv \
+              && cd python-sc2 && uv sync --frozen --no-cache --no-install-project"
+          echo "Run various test bots"
+          docker exec -i test_container bash -c "cd python-sc2 && uv run python test/travis_test_script.py test/autotest_bot.py"
+          docker exec -i test_container bash -c "cd python-sc2 && uv run python test/run_example_bots_vs_computer.py"
+
+      - name: Login to DockerHub
+        if: github.ref == 'refs/heads/develop'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Upload docker image
+        if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
+        run: docker push $IMAGE_NAME-v$VERSION_NUMBER
+
+      - name: Upload squashed docker image
+        if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
+        run: docker push $IMAGE_NAME-v$VERSION_NUMBER-squashed
+
+      - name: Upload squashed docker image as latest tag
+        if: github.ref == 'refs/heads/develop' && github.event_name == 'push' && matrix.python-version == env.LATEST_PYTHON_VERSION && matrix.sc2-version == env.LATEST_SC2_VERSION
+        run: |
+          docker tag $IMAGE_NAME-v$VERSION_NUMBER-squashed burnysc2/python-sc2-docker:latest
+          docker push burnysc2/python-sc2-docker:latest

.gitignore

@@ -28,6 +28,6 @@ mini_games/
 .coverage
 /htmlcov
 
-/bat_files/temp/
+docs/
 
-/docs
+.pyre