Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test python 3.8 and Django 3.0 #94

Merged
merged 23 commits into from
Jun 12, 2020
Merged

Test python 3.8 and Django 3.0 #94

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ad45147
Test python 3.8 and Django 3.0
giff-h Jan 18, 2020
45d0e3d
Dropping support for django 2.0 and 2.1
KatherineMichel Jan 22, 2020
cd8e83e
Making checksum correction
KatherineMichel Jan 23, 2020
9f93ff8
Removing contributing doc
KatherineMichel Jan 25, 2020
6b0e485
Fixing team email
KatherineMichel Jan 25, 2020
9137fac
Fix forward slash and license date
KatherineMichel Feb 18, 2020
1b53186
Fix license date
KatherineMichel Feb 18, 2020
9351279
Update CircleCI version
KatherineMichel Feb 21, 2020
4372319
Remove setup.cfg
KatherineMichel Feb 21, 2020
77ec1b3
Update tox deps versions
KatherineMichel Feb 21, 2020
6456059
Bumping version
KatherineMichel Feb 21, 2020
4e39ed3
Update `setup.py` classifiers
giff-h Mar 3, 2020
2ca5607
Updating Makefile
KatherineMichel Mar 7, 2020
0c3f2dd
Consolidating dependency installation in CircleCI config
KatherineMichel Mar 7, 2020
855866e
Dropping Python 2.7 support and updating README.mdd
KatherineMichel Mar 7, 2020
bea840f
Remove .coveragerc bc/can be read from tox.ini
KatherineMichel Mar 21, 2020
c4b7401
Fix linebreak
KatherineMichel Apr 20, 2020
4813e7b
Fix capitalization
KatherineMichel Apr 20, 2020
0056b53
Making checkqa happy
KatherineMichel May 4, 2020
267aa05
Update syntax to drop support
KatherineMichel May 17, 2020
a6f1543
Fix tox
KatherineMichel May 17, 2020
b5d89ce
Fix linting
KatherineMichel May 17, 2020
5c41175
Update lockfile with f-string
KatherineMichel Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 1 addition & 78 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,58 +34,16 @@ jobs:
lint:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.8
environment:
- TOXENV=checkqa
- UPLOAD_COVERAGE=0
py35dj111:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj111
py35dj20:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj20
py35dj21:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj21
py35dj22:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj22
py35dj30:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj30
py36dj111:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj111
py36dj20:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj20
py36dj21:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj21
py36dj22:
<<: *common
docker:
Expand All @@ -104,18 +62,6 @@ jobs:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj111
py37dj20:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj20
py37dj21:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj21
py37dj22:
<<: *common
docker:
Expand All @@ -128,18 +74,6 @@ jobs:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj30
py38dj20:
<<: *common
docker:
- image: circleci/python:3.8
environment:
TOXENV=py38-dj20
py38dj21:
<<: *common
docker:
- image: circleci/python:3.8
environment:
TOXENV=py38-dj21
py38dj22:
<<: *common
docker:
Expand All @@ -158,22 +92,11 @@ workflows:
test:
jobs:
- lint
- py35dj111
- py35dj20
- py35dj21
- py35dj22
- py35dj30
- py36dj111
- py36dj20
- py36dj21
- py36dj22
- py36dj30
- py37dj111
- py37dj20
- py37dj21
- py37dj22
- py37dj30
- py38dj20
- py38dj21
- py38dj22
- py38dj30
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ all: init test

init:
python setup.py develop
pip install detox coverage
# pip install tox coverage<5

test:
coverage erase
detox
tox --parallel
coverage html
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ configurable options as to how those notifications are to be received. `pinax-no

#### Supported Django and Python versions

Django / Python | 3.5 | 3.6 | 3.7 | 3.8
--------------- | --- | --- | --- | ---
1.11 | * | * | * | *
2.x | * | * | * | *
3.0 | | * | * | *
Django \ Python | 3.6 | 3.7 | 3.8
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KatherineMichel why the swap of slash direction here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must have accidentally copied it from someplace that had it backwards.

--------------- | --- | --- | ---
1.11 | * | * |
2.2 | * | * | *
3.0 | * | * | *


## Documentation
Expand Down
21 changes: 9 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
Supported Django and Python Versions
------------------------------------

+-----------------+-----+-----+-----+-----+
| Django / Python | 3.5 | 3.6 | 3.7 | 3.8 |
+=================+=====+=====+=====+=====+
| 1.11 | * | * | * | * |
+-----------------+-----+-----+-----+-----+
| 2.x | * | * | * | * |
+-----------------+-----+-----+-----+-----+
| 3.0 | | * | * | * |
+-----------------+-----+-----+-----+-----+
+-----------------+-----+-----+-----+
| Django / Python | 3.6 | 3.7 | 3.8 |
+=================+=====+=====+=====+
| 1.11 | * | * | |
+-----------------+-----+-----+-----+
| 2.2 | * | * | * |
+-----------------+-----+-----+-----+
| 3.0 | * | * | * |
+-----------------+-----+-----+-----+
"""

setup(
Expand All @@ -83,16 +83,13 @@
"Environment :: Web Environment",
"Framework :: Django",
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
'Programming Language :: Python :: 3',
giff-h marked this conversation as resolved.
Show resolved Hide resolved
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,15 @@ show_missing = True
[tox]
envlist =
checkqa,
py{35,36,37,38}-dj{111,20,21,22}
py{36,37,38}-dj30
py{36,37}-dj{111,22,30}
py38-dj{22,30}

[testenv]
passenv = CI CIRCLECI CIRCLE_*
deps =
coverage
coverage<5
codecov
dj111: Django>=1.11,<1.12
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<3.0
dj30: Django>=3.0,<3.1
master: https://github.com/django/django/tarball/master
Expand Down