diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 93ce31c5..1ce76788 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,11 +10,17 @@ jobs: runs-on: ubuntu-latest steps: +<<<<<<< support-3.12 + - uses: actions/checkout@v3 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 +======= - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v5 +>>>>>>> master with: - python-version: "3.10" + python-version: "3.11" - name: Build wheel and source tarball run: | pip install wheel diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9112718a..874e87fe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,11 +7,17 @@ jobs: runs-on: ubuntu-latest steps: +<<<<<<< support-3.12 + - uses: actions/checkout@v3 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 +======= - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v5 +>>>>>>> master with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0389d7ad..b1e080c7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,11 @@ jobs: fail-fast: false matrix: include: +<<<<<<< support-3.12 + - {name: '3.12.0-rc.1', python: '3.12.0-rc.1', os: ubuntu-latest, tox: py312} +======= - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312} +>>>>>>> master - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311} - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310} - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} @@ -52,12 +56,12 @@ jobs: - run: pip install tox - run: tox -e ${{ matrix.tox }} - name: Upload coverage.xml - if: ${{ matrix.python == '3.10' }} + if: ${{ matrix.python == '3.11' }} uses: actions/upload-artifact@v3 with: name: graphene-coverage path: coverage.xml if-no-files-found: error - name: Upload coverage.xml to codecov - if: ${{ matrix.python == '3.10' }} + if: ${{ matrix.python == '3.11' }} uses: codecov/codecov-action@v3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eece56e0..426c24e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ default_language_version: - python: python3.10 + python: python3.11 repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/README.md b/README.md index 7beb975c..5445c17c 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ tox If you wish to run against a specific version defined in the `tox.ini` file: ```sh -tox -e py39 +tox -e py311 ``` Tox can only use whatever versions of Python are installed on your system. When you create a pull request, GitHub Actions pipelines will also be running the same tests and report the results, so there is no need for potential contributors to try to install every single version of Python on their own system ahead of time. We appreciate opening issues and pull requests to make graphene even more stable & useful! diff --git a/README.rst b/README.rst index 6b26404f..ed4738cc 100644 --- a/README.rst +++ b/README.rst @@ -141,7 +141,11 @@ file: .. code:: sh +<<<<<<< support-3.12 + tox -e py311 +======= tox -e py10 +>>>>>>> master Tox can only use whatever versions of Python are installed on your system. When you create a pull request, Travis will also be running the diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 31f51500..93914a5d 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -60,6 +60,7 @@ Requirements ~~~~~~~~~~~~ - Python (3.8, 3.9, 3.10, 3.11, 3.12, pypy) + - Graphene (3.0) Project setup diff --git a/setup.py b/setup.py index 6ae8a1d5..d618b17d 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,10 @@ def run_tests(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", +<<<<<<< support-3.12 +======= "Programming Language :: Python :: 3.12", +>>>>>>> master ], keywords="api graphql protocol rest relay graphene", packages=find_packages(exclude=["examples*"]), diff --git a/tox.ini b/tox.ini index 767f957c..9ab50bf0 100644 --- a/tox.ini +++ b/tox.ini @@ -8,10 +8,14 @@ deps = setenv = PYTHONPATH = .:{envdir} commands = +<<<<<<< support-3.12 + py{38,39,310,311,312}: pytest --cov=graphene graphene --cov-report=term --cov-report=xml examples {posargs} +======= py{38,39,310,311,12}: pytest --cov=graphene graphene --cov-report=term --cov-report=xml examples {posargs} +>>>>>>> master [testenv:pre-commit] -basepython = python3.10 +basepython = python3.11 deps = pre-commit>=2.16,<3 setenv = @@ -20,7 +24,7 @@ commands = pre-commit run --all-files --show-diff-on-failure [testenv:mypy] -basepython = python3.10 +basepython = python3.11 deps = mypy>=0.950,<1 commands =