From 5a0bdb4dd8ee9af651763438db10d3d077e69d24 Mon Sep 17 00:00:00 2001 From: belerico Date: Tue, 9 Apr 2024 19:51:49 +0200 Subject: [PATCH 1/9] Upgrade max python version to 3.11 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6577c495..23ea930f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ maintainers = [ keywords = ["reinforcement", "machine", "learning", "distributed", "production"] license = { file = "LICENSE" } readme = { file = "docs/README.md", content-type = "text/markdown" } -requires-python = ">=3.8,<3.11" +requires-python = ">=3.8,<3.12" classifiers = ["Programming Language :: Python", "Topic :: Scientific/Engineering :: Artificial Intelligence"] dependencies = [ "gymnasium==0.29.*", From f2b04beb6040b4762da6a0004684a408ba8b010f Mon Sep 17 00:00:00 2001 From: belerico Date: Wed, 10 Apr 2024 22:22:50 +0200 Subject: [PATCH 2/9] Tests on python 3.11 --- .github/workflows/cpu-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 9cf9cc79..0eda7b25 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11"] timeout-minutes: 20 From 3e20dbb50711d2ca868f81ce553ed73d237aa735 Mon Sep 17 00:00:00 2001 From: belerico Date: Wed, 10 Apr 2024 22:30:13 +0200 Subject: [PATCH 3/9] Add badges --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9cc9e3bf..de9eeaa4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # ⚡ SheepRL 🐑 +[![Python 3.8](https://img.shields.io/badge/python-3.8-blue.svg)](https://www.python.org/downloads/release/python-380/) +[![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-390/) +[![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/) +[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/) +

From 527c56c6b55074b31bdee565664feb9dc399139f Mon Sep 17 00:00:00 2001 From: belerico Date: Wed, 10 Apr 2024 22:54:53 +0200 Subject: [PATCH 4/9] Force use python from venv --- .github/workflows/cpu-tests.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 0eda7b25..973f1702 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -47,15 +47,15 @@ jobs: shell: powershell run: | env\\Scripts\\Activate.ps1 - pip install swig - pip install -e .[atari,box2d,test,dev] + python -m pip install swig + python -m pip install -e .[atari,box2d,test,dev] - name: Install packages Linux if: ${{ matrix.os == 'ubuntu-latest' }} run: | source env/bin/activate - pip install swig - pip install -e .[atari,box2d,test,dev] + python -m pip install swig + python -m pip install -e .[atari,box2d,test,dev] - name: Run tests Windows if: ${{ matrix.os == 'windows-latest' }} From 2fc7c7f75a888bbdfcefd0704e824f65e1c378e7 Mon Sep 17 00:00:00 2001 From: belerico Date: Thu, 11 Apr 2024 09:49:56 +0200 Subject: [PATCH 5/9] Add swig to path --- .github/workflows/cpu-tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 973f1702..71200cc8 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -48,6 +48,7 @@ jobs: run: | env\\Scripts\\Activate.ps1 python -m pip install swig + $env:Path = '${GITHUB_WORKSPACE}/env/bin/swig;' + $env:Path python -m pip install -e .[atari,box2d,test,dev] - name: Install packages Linux @@ -55,6 +56,7 @@ jobs: run: | source env/bin/activate python -m pip install swig + PATH="${GITHUB_WORKSPACE}/env/bin/swig:$PATH" python -m pip install -e .[atari,box2d,test,dev] - name: Run tests Windows From bc020e9b40ad1cb0d8b8fb1d4766c9990c6ce3af Mon Sep 17 00:00:00 2001 From: belerico Date: Thu, 11 Apr 2024 09:56:35 +0200 Subject: [PATCH 6/9] Update swig path from which on Linux --- .github/workflows/cpu-tests.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 71200cc8..666a6e66 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -48,7 +48,7 @@ jobs: run: | env\\Scripts\\Activate.ps1 python -m pip install swig - $env:Path = '${GITHUB_WORKSPACE}/env/bin/swig;' + $env:Path + $env:Path = '${GITHUB_WORKSPACE}\\env\\Scripts\\swig.exe;' + $env:Path python -m pip install -e .[atari,box2d,test,dev] - name: Install packages Linux @@ -56,7 +56,8 @@ jobs: run: | source env/bin/activate python -m pip install swig - PATH="${GITHUB_WORKSPACE}/env/bin/swig:$PATH" + SWIG_PATH=$(which swig) + PATH="$SWIG_PATH:$PATH" python -m pip install -e .[atari,box2d,test,dev] - name: Run tests Windows From 498b213f99a017903623b4ce7c35ee19142c0ef0 Mon Sep 17 00:00:00 2001 From: belerico Date: Thu, 11 Apr 2024 10:16:56 +0200 Subject: [PATCH 7/9] Install swig from apy --- .github/workflows/cpu-tests.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 666a6e66..5feee55e 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -54,10 +54,8 @@ jobs: - name: Install packages Linux if: ${{ matrix.os == 'ubuntu-latest' }} run: | + apt-get install --no-install-recommends -y swig source env/bin/activate - python -m pip install swig - SWIG_PATH=$(which swig) - PATH="$SWIG_PATH:$PATH" python -m pip install -e .[atari,box2d,test,dev] - name: Run tests Windows From cb7be5a1eca129b28744cf15fd9aac50006f9ac7 Mon Sep 17 00:00:00 2001 From: belerico Date: Thu, 11 Apr 2024 10:19:09 +0200 Subject: [PATCH 8/9] Add sudo --- .github/workflows/cpu-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 5feee55e..65c7fd0f 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -54,7 +54,7 @@ jobs: - name: Install packages Linux if: ${{ matrix.os == 'ubuntu-latest' }} run: | - apt-get install --no-install-recommends -y swig + sudo apt-get install --no-install-recommends -y swig source env/bin/activate python -m pip install -e .[atari,box2d,test,dev] From b254cd683c23f968060ca0fd8f70197d685fac88 Mon Sep 17 00:00:00 2001 From: belerico Date: Thu, 11 Apr 2024 10:26:25 +0200 Subject: [PATCH 9/9] Install swig from chocolatey --- .github/workflows/cpu-tests.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cpu-tests.yaml b/.github/workflows/cpu-tests.yaml index 65c7fd0f..2cc88abf 100644 --- a/.github/workflows/cpu-tests.yaml +++ b/.github/workflows/cpu-tests.yaml @@ -46,15 +46,14 @@ jobs: if: ${{ matrix.os == 'windows-latest' }} shell: powershell run: | + choco upgrade swig -y env\\Scripts\\Activate.ps1 - python -m pip install swig - $env:Path = '${GITHUB_WORKSPACE}\\env\\Scripts\\swig.exe;' + $env:Path python -m pip install -e .[atari,box2d,test,dev] - name: Install packages Linux if: ${{ matrix.os == 'ubuntu-latest' }} run: | - sudo apt-get install --no-install-recommends -y swig + sudo apt-get install --no-install-recommends -y --only-upgrade swig source env/bin/activate python -m pip install -e .[atari,box2d,test,dev]