Skip to content

Commit

Permalink
Merge pull request #35 from pinax/adding-python-3.7-support
Browse files Browse the repository at this point in the history
Adding python 3.7 support
  • Loading branch information
KatherineMichel authored Jan 13, 2020
2 parents 3e7046d + a2fd166 commit 2a820ac
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 17 deletions.
18 changes: 16 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
lint:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
- TOXENV=checkqa
- UPLOAD_COVERAGE=0
Expand Down Expand Up @@ -80,6 +80,18 @@ jobs:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj20
py37dj111:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj111
py37dj20:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV=py37-dj20

workflows:
version: 2
Expand All @@ -92,4 +104,6 @@ workflows:
- py35dj111
- py35dj20
- py36dj111
- py36dj20
- py36dj20
- py37dj111
- py37dj20
4 changes: 2 additions & 2 deletions Makefile
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

test:
coverage erase
detox
tox --parallel
coverage html
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ add badges to a Django project.

#### Supported Django and Python versions

Django \ Python | 2.7 | 3.4 | 3.5 | 3.6
--------------- | --- | --- | --- | ---
1.11 | * | * | * | *
2.0 | | * | * | *
Django \ Python | 2.7 | 3.4 | 3.5 | 3.6 | 3.7
--------------- | --- | --- | --- | --- | ---
1.11 | * | * | * | * | *
2.0 | | * | * | * | *


## Documentation
Expand Down Expand Up @@ -313,6 +313,11 @@ Context data:

## Change Log

### 2.0.3

* Add Python 3.7 to the support versions matrix due to change made in v2.0.1
* Change `detox` to `tox --parallel`

### 2.0.2

* Don't fail when importing pinax.badges.tasks if celery is not installed.
Expand Down
19 changes: 10 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

VERSION = "2.0.2"
VERSION = "2.0.3"
LONG_DESCRIPTION = """
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-badges.svg
:target: https://pypi.python.org/pypi/pinax-badges/
Expand Down Expand Up @@ -39,13 +39,13 @@
Supported Django and Python Versions
------------------------------------
+-----------------+-----+-----+-----+-----+
| Django / Python | 2.7 | 3.4 | 3.5 | 3.6 |
+=================+=====+=====+=====+=====+
| 1.11 | * | * | * | * |
+-----------------+-----+-----+-----+-----+
| 2.0 | | * | * | * |
+-----------------+-----+-----+-----+-----+
+-----------------+-----+-----+-----+-----+-----+
| Django / Python | 2.7 | 3.4 | 3.5 | 3.6 | 3.7 |
+=================+=====+=====+=====+=====+=====+
| 1.11 | * | * | * | * | * |
+-----------------+-----+-----+-----+-----+-----+
| 2.0 | | * | * | * | * |
+-----------------+-----+-----+-----+-----+-----+
"""

setup(
Expand All @@ -71,12 +71,13 @@
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
"Topic :: Software Development :: Libraries :: Python Modules",
],
install_requires=[
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ envlist =
py34-dj{111,20}
py35-dj{111,20}
py36-dj{111,20}
py37-dj{111,20}

[testenv]
passenv = CI CIRCLECI CIRCLE_*
Expand Down

0 comments on commit 2a820ac

Please sign in to comment.