Skip to content

Commit

Permalink
Update nox to latest supported python versions. (#362)
Browse files Browse the repository at this point in the history
* Update parameters to match latest python releases.

* update setup.py, other references to 3.5

* don't use miniconda 3.8 even though https://www.appveyor.com/docs/windows-images-software/ mentions it
  • Loading branch information
crwilcox committed Nov 21, 2020
1 parent 6bdf51c commit e5e9869
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ language: python
dist: xenial
matrix:
include:
- python: '3.5'
env: NOXSESSION="tests-3.5"
- python: '3.6'
env: NOXSESSION="tests-3.6"
- python: '3.7'
env: NOXSESSION="tests-3.7"
- python: '3.8'
env: NOXSESSION="tests-3.8"
- python: '3.9'
env: NOXSESSION="tests-3.9"
- python: '3.8'
env: NOXSESSION="lint"
- python: '3.8'
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ To just check for lint errors, run:

To run against a particular Python version:

nox --session tests-3.5
nox --session tests-3.6
nox --session tests-3.7
nox --session tests-3.8
nox --session tests-3.9


When you send a pull request Travis will handle running everything, but it is
recommended to test as much as possible locally before pushing.
Expand Down
17 changes: 10 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ environment:
# a later point release.
# See: http://www.appveyor.com/docs/installed-software#python

- PYTHON: "C:\\Python39"
# There is no miniconda for python3.9 at this time
CONDA: "C:\\Miniconda37"
NOX_SESSION: "tests-3.9"

- PYTHON: "C:\\Python39-x64"
# There is no miniconda for python3.9 at this time
CONDA: "C:\\Miniconda37-x64"
NOX_SESSION: "tests-3.9"

- PYTHON: "C:\\Python38"
# There is no miniconda for python3.8 at this time
CONDA: "C:\\Miniconda37"
Expand All @@ -36,13 +46,6 @@ environment:
CONDA: "C:\\Miniconda36-x64"
NOX_SESSION: "tests-3.6"

- PYTHON: "C:\\Python35"
CONDA: "C:\\Miniconda35"
NOX_SESSION: "tests-3.5"

- PYTHON: "C:\\Python35-x64"
CONDA: "C:\\Miniconda35-x64"
NOX_SESSION: "tests-3.5"

install:
# Add conda command to path.
Expand Down
4 changes: 2 additions & 2 deletions docs/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ When collecting your sessions, Nox will create a separate session for each inter

.. code-block:: python
@nox.session(python=['2.7', '3.5', '3.6', '3.7', '3.8'])
@nox.session(python=['2.7', '3.6', '3.7', '3.8', '3.9'])
def tests(session):
pass
Expand All @@ -125,10 +125,10 @@ Will produce these sessions:
.. code-block:: console
* tests-2.7
* tests-3.5
* tests-3.6
* tests-3.7
* tests-3.8
* tests-3.9
Note that this expansion happens *before* parameterization occurs, so you can still parametrize sessions with multiple interpreters.

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ If you want your session to run against multiple versions of Python:

.. code-block:: python
@nox.session(python=["2.7", "3.5", "3.7"])
@nox.session(python=["2.7", "3.6", "3.7"])
def test(session):
...
Expand All @@ -294,7 +294,7 @@ been expanded into three distinct sessions:
Sessions defined in noxfile.py:
* test-2.7
* test-3.5
* test-3.6
* test-3.7
You can run all of the ``test`` sessions using ``nox --sessions test`` or run
Expand Down
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def is_python_version(session, version):
return py_version.startswith(version)


@nox.session(python=["3.5", "3.6", "3.7", "3.8"])
@nox.session(python=["3.6", "3.7", "3.8", "3.9"])
def tests(session):
"""Run test suite with pytest."""
session.create_tmp()
Expand All @@ -44,7 +44,7 @@ def tests(session):
session.notify("cover")


@nox.session(python=["3.5", "3.6", "3.7", "3.8"], venv_backend="conda")
@nox.session(python=["3.6", "3.7", "3.8", "3.9"], venv_backend="conda")
def conda_tests(session):
"""Run test suite with pytest."""
session.create_tmp()
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"Environment :: Console",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Operating System :: POSIX",
"Operating System :: MacOS",
"Operating System :: Unix",
Expand Down Expand Up @@ -68,5 +68,5 @@
"Source Code": "https://github.com/theacodes/nox",
"Bug Tracker": "https://github.com/theacodes/nox/issues",
},
python_requires=">=3.5",
python_requires=">=3.6",
)

0 comments on commit e5e9869

Please sign in to comment.