Skip to content

Commit

Permalink
Test with Python 3.8 (#263)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamchainz authored Oct 30, 2019
1 parent 9f43a02 commit 3f0f69d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
3.8.0
3.7.4
3.6.9
3.5.7
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069)
dist: xenial
env:
global:
- ELASTICSEARCH_URL="http://localhost:9200/"
Expand All @@ -20,6 +20,7 @@ python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"

script:
- pip install --upgrade tox
Expand All @@ -30,7 +31,7 @@ jobs:
include:
- stage: test
name: "Check code style"
python: "3.7" # prevent matrix expansion
python: "3.8" # prevent matrix expansion
script:
- pip install --upgrade tox
- tox -e check
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Pending

### Added

- Python 3.8 testing and PyPI trove classifier - no code changes were required
so older versions should work too
([PR #263](https://github.com/scoutapp/scout_apm_python/pull/263)).

### Fixed

- Changed `scout_apm.api.install()` signature to not take `*args, **kwargs` but
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,6 @@
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
)
15 changes: 9 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ envlist =
check,
{py27,py34,py35}-django18,
{py27,py34,py35,py36}-django111,
{py34,py35,py36,py37}-django20,
{py35,py36,py37}-django21,
{py35,py36,py37}-django22
{py36,py37}-django30
{py34,py35,py36,py37,py38}-django20,
{py35,py36,py37,py38}-django21,
{py35,py36,py37,py38}-django22
{py36,py37,py38}-django30

[testenv]
basepython =
Expand All @@ -16,7 +16,8 @@ basepython =
py35: {env:TOXPYTHON:python3.5}
py36: {env:TOXPYTHON:python3.6}
py37: {env:TOXPYTHON:python3.7}
{clean,check,report}: {env:TOXPYTHON:python3.7}
py38: {env:TOXPYTHON:python3.8}
{clean,check,report}: {env:TOXPYTHON:python3.8}
setenv =
PYTHONPATH={toxinidir}/tests
PYTHONUNBUFFERED=yes
Expand Down Expand Up @@ -71,7 +72,9 @@ commands =
check-manifest {toxinidir}
black --check src tests setup.py
isort --check-only --recursive src tests setup.py
flake8 src tests setup.py
# --jobs 0 is used because of https://gitlab.com/pycqa/flake8/issues/587
# should be removed when fixed to speed up
flake8 --jobs 0 src tests setup.py
twine check {distdir}/*

[testenv:report]
Expand Down

0 comments on commit 3f0f69d

Please sign in to comment.