From 2f00cd1a71ada70748b1f2e6c423282fc618f7d9 Mon Sep 17 00:00:00 2001 From: Sebastian Weigand Date: Sat, 29 Jan 2022 19:57:55 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8Add=20Python=203.10=20support=20(#977)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🚇🧪 Add tests for python 3.10 * ⬆️ Raised max supported python version to <3.11 * ⬆️ Unpin setuptools Using an old version of setuptools caused a lot of import errors in python 3.10 Pinning the version of setuptools goes back to the time when we still had c-extensions, so it is save to unpin it * 🚧📚 Added change to changelog --- .github/dependabot.yml | 44 +++++++++++++---------------- .github/workflows/CI_CD_actions.yml | 2 +- changelog.md | 1 + requirements_dev.txt | 1 - setup.cfg | 3 +- tox.ini | 2 +- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2c1b25ff5..13205cb9f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,27 +1,23 @@ version: 2 updates: -- package-ecosystem: pip - directory: "/" - schedule: - interval: weekly - day: friday - time: "18:00" - timezone: Europe/Amsterdam - open-pull-requests-limit: 20 - reviewers: - - jsnel - assignees: - - jsnel - ignore: - - dependency-name: setuptools - versions: - - "> 41.2" + - package-ecosystem: pip + directory: "/" + schedule: + interval: weekly + day: friday + time: "18:00" + timezone: Europe/Amsterdam + open-pull-requests-limit: 20 + reviewers: + - jsnel + assignees: + - jsnel -# Maintain dependencies for GitHub Actions -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - day: friday - time: "18:00" - timezone: Europe/Amsterdam + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + day: friday + time: "18:00" + timezone: Europe/Amsterdam diff --git a/.github/workflows/CI_CD_actions.yml b/.github/workflows/CI_CD_actions.yml index 9754a1ad6..7dc8e0171 100644 --- a/.github/workflows/CI_CD_actions.yml +++ b/.github/workflows/CI_CD_actions.yml @@ -111,7 +111,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, "3.10"] steps: - uses: actions/checkout@v2 diff --git a/changelog.md b/changelog.md index 12305aabe..7e16ab074 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ ### ✨ Features +- ✨ Python 3.10 support (#977) - ✨ Add simple decay megacomplexes (#860) - ✨ Feature: Generators (#866) diff --git a/requirements_dev.txt b/requirements_dev.txt index 8a3fb623b..0359d264e 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -13,7 +13,6 @@ rich==11.1.0 ruamel.yaml==0.17.20 scipy==1.7.3 sdtfile==2021.11.18 -setuptools==41.2 tabulate==0.8.9 xarray==0.20.2 diff --git a/setup.cfg b/setup.cfg index ee5dd8644..dfe818c91 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifiers = Programming Language :: Python :: 3 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Topic :: Scientific/Engineering Topic :: Scientific/Engineering :: Chemistry Topic :: Scientific/Engineering :: Physics @@ -45,7 +46,7 @@ install_requires = setuptools>=41.2 tabulate>=0.8.8 xarray!=0.20.0,!=0.20.1,!=0.21.0,>=0.16.2 -python_requires = >=3.8, <3.10 +python_requires = >=3.8, <3.11 setup_requires = setuptools>=41.2 tests_require = pytest diff --git a/tox.ini b/tox.ini index fb5dd6105..b823b6a2e 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ minversion = 3.4.0 skipsdist = true skip_missing_interpreters=true -envlist = py{38}, pre-commit, docs, docs-notebooks, docs-links +envlist = py{38,39,310}, pre-commit, docs, docs-notebooks, docs-links [pytest] ; Uncomment the following lines to deactivate pyglotaran all plugins