diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 755af66..29743b9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,16 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'windows-latest' && matrix.python-version != '3.10' - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.8.0' -f https://download.pytorch.org/whl/cpu/torch/ - - if: matrix.os == 'windows-latest' && matrix.python-version == '3.10' - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/ - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/minimum.yml b/.github/workflows/minimum.yml index 349046e..e56b5a5 100644 --- a/.github/workflows/minimum.yml +++ b/.github/workflows/minimum.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,16 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'windows-latest' && matrix.python-version != 3.10 - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.8.0' -f https://download.pytorch.org/whl/cpu/torch/ - - if: matrix.os == 'windows-latest' && matrix.python-version == 3.10 - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/ - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 7c03b41..14fddf4 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 220ec98..288a67e 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,16 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'windows-latest' && matrix.python-version != 3.10 - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.8.0' -f https://download.pytorch.org/whl/cpu/torch/ - - if: matrix.os == 'windows-latest' && matrix.python-version == 3.10 - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/ - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index c080c5a..2550f8b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -120,7 +120,7 @@ Before you submit a pull request, check that it meets these guidelines: 4. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -5. The pull request should work for Python 3.8, 3.9, and 3.10. Check +5. The pull request should work for Python 3.8, 3.9, 3.10 and 3.11. Check https://github.com/sdv-dev/SDGym/actions and make sure that all the checks pass. diff --git a/INSTALL.md b/INSTALL.md index af79575..af913df 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,7 +2,7 @@ ## Requirements -**SDGym** has been developed and tested on [Python 3.8, 3.9, and 3.10](https://www.python.org/downloads/) +**SDGym** has been developed and tested on [Python 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/) Also, although it is not strictly required, the usage of a [virtualenv]( https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid diff --git a/setup.py b/setup.py index bd2f288..7132f13 100644 --- a/setup.py +++ b/setup.py @@ -19,16 +19,18 @@ 'humanfriendly>=8.2,<11', "numpy>=1.20.0,<2;python_version<'3.10'", "numpy>=1.23.3,<2;python_version>='3.10'", - "pandas>=1.1.3,<2;python_version<'3.10'", - "pandas>=1.5.0,<2;python_version>='3.10'", + "pandas>=1.1.3;python_version<'3.10'", + "pandas>=1.3.4;python_version>='3.10' and python_version<'3.11'", + "pandas>=1.5.0;python_version>='3.11'", 'psutil>=5.7,<6', "scikit-learn>=0.24,<2;python_version<'3.10'", "scikit-learn>=1.1.3,<2;python_version>='3.10'", "scipy>=1.5.4,<2;python_version<'3.10'", "scipy>=1.9.2,<2;python_version>='3.10'", 'tabulate>=0.8.3,<0.9', - "torch>=1.8.0,<3;python_version<'3.10'", - "torch>=1.11.0,<3;python_version>='3.10'", + "torch>=1.8.0;python_version<'3.10'", + "torch>=1.11.0;python_version>='3.10' and python_version<'3.11'", + "torch>=2.0.0;python_version>='3.11'", 'tqdm>=4.15,<5', 'XlsxWriter>=1.2.8,<4', 'rdt>=1.3.0,<2.0', @@ -112,6 +114,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Scientific/Engineering :: Artificial Intelligence', ], description=( diff --git a/tox.ini b/tox.ini index 09c1647..20a886f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-lint, py3{8,9,10}-{integration,unit,minimum,readme} +envlist = py38-lint, py3{8,9,10,11}-{integration,unit,minimum,readme} [testenv] skipsdist = false