Merge pull request #30 from mfonism/2020.03.25/update-python-and-djan…

…go-support

Update Python and Django Support

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2.0
+version: 2.1
 
 common: &common
  working_directory: ~/repo
@@ -7,9 +7,10 @@ common: &common
  - restore_cache:
  keys:
  - v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+ - v2-deps-
  - run:
  name: install dependencies
- command: pip install --user tox
+ command: pip install --user tox codecov "coverage<5"
  - run:
  name: run tox
  command: ~/.local/bin/tox
@@ -18,7 +19,6 @@ common: &common
  command: |
  if [[ "$UPLOAD_COVERAGE" != 0 ]]; then
  PATH=$HOME/.local/bin:$PATH
- pip install --user codecov
  coverage xml
  ~/.local/bin/codecov --required -X search gcov pycov -f coverage.xml --flags $CIRCLE_JOB
  fi
@@ -34,62 +34,55 @@ jobs:
  lint:
  <<: *common
  docker:
- - image: circleci/python:3.6
+ - image: circleci/python:3.8
  environment:
  - TOXENV=checkqa
  - UPLOAD_COVERAGE=0
- py27dj111:
- <<: *common
- docker:
- - image: circleci/python:2.7
- environment:
- TOXENV=py27-dj111
- py34dj111:
+ py36dj22:
  <<: *common
  docker:
- - image: circleci/python:3.4
+ - image: circleci/python:3.6
  environment:
- TOXENV=py34-dj111
- py34dj20:
+ TOXENV=py36-dj22
+ py36dj30:
  <<: *common
  docker:
- - image: circleci/python:3.4
+ - image: circleci/python:3.6
  environment:
- TOXENV=py34-dj20
- py35dj111:
+ TOXENV=py36-dj30
+ py37dj22:
  <<: *common
  docker:
- - image: circleci/python:3.5
+ - image: circleci/python:3.7
  environment:
- TOXENV=py35-dj111
- py35dj20:
+ TOXENV=py37-dj22
+ py37dj30:
  <<: *common
  docker:
- - image: circleci/python:3.5
+ - image: circleci/python:3.7
  environment:
- TOXENV=py35-dj20
- py36dj111:
+ TOXENV=py37-dj30
+ py38dj22:
  <<: *common
  docker:
- - image: circleci/python:3.6
+ - image: circleci/python:3.8
  environment:
- TOXENV=py36-dj111
- py36dj20:
+ TOXENV=py38-dj22
+ py38dj30:
  <<: *common
  docker:
- - image: circleci/python:3.6
+ - image: circleci/python:3.8
  environment:
- TOXENV=py36-dj20
+ TOXENV=py38-dj30
 
 workflows:
  version: 2
  test:
  jobs:
  - lint
- - py27dj111
- - py34dj111
- - py34dj20
- - py35dj111
- - py35dj20
- - py36dj111
- - py36dj20
+ - py36dj22
+ - py36dj30
+ - py37dj22
+ - py37dj30
+ - py38dj22
+ - py38dj30

.gitignore

@@ -36,6 +36,7 @@ pip-delete-this-directory.txt
 htmlcov/
 .tox/
 .coverage
+.coveragerc
 .cache
 nosetests.xml
 coverage.xml

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2019 James Tauber and contributors
+Copyright (c) 2012-present James Tauber and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -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--safe-build
  coverage html