Merge pull request #103 from benjaoming/django32

Migrate to Circle CI and Support Django 3.2

Author: benjaoming

.circleci/config.yml

@@ -0,0 +1,64 @@
+version: 2.1
+
+orbs:
+  python: circleci/[email protected]
+
+jobs:
+  tox:
+    parameters:
+      tox_env:
+        description: "Name of Tox environment to run"
+        default: "py38"
+        type: string
+      python_version:
+        description: "Python version string"
+        default: "3.8"
+        type: string
+    description: "Reusable job for invoking tox"
+    docker:
+    - image: circleci/python:<<parameters.python_version>>
+    steps:
+      - checkout
+      - run: pip install tox && tox -e <<parameters.tox_env>>
+workflows:
+  main:
+    jobs:
+      - tox:
+          tox_env: "py36-django22"
+          python_version: "3.6"
+      - tox:
+          tox_env: "py36-django30"
+          python_version: "3.6"
+      - tox:
+          tox_env: "py36-django31"
+          python_version: "3.6"
+      - tox:
+          tox_env: "py36-django32"
+          python_version: "3.6"
+      - tox:
+          tox_env: "py37-django22"
+          python_version: "3.7"
+      - tox:
+          tox_env: "py37-django30"
+          python_version: "3.7"
+      - tox:
+          tox_env: "py37-django31"
+          python_version: "3.7"
+      - tox:
+          tox_env: "py37-django32"
+          python_version: "3.7"
+      - tox:
+          tox_env: "py38-django30"
+          python_version: "3.8"
+      - tox:
+          tox_env: "py38-django31"
+          python_version: "3.8"
+      - tox:
+          tox_env: "py38-django32"
+          python_version: "3.8"
+      - tox:
+          tox_env: "py39-django32"
+          python_version: "3.9"
+      - tox:
+          tox_env: "lint"
+          python_version: "3.8"

.travis.yml

@@ -1,8 +1,8 @@
 django-nyt
 ==========
 
-.. image:: https://travis-ci.org/django-wiki/django-nyt.png?branch=master
-   :target: https://travis-ci.org/django-wiki/django-nyt
+.. |Build status| image:: https://circleci.com/gh/django-wiki/django-nyt.svg?style=shield
+   :target: https://circleci.com/gh/django-wiki/django-nyt
 .. image:: https://readthedocs.org/projects/django-nyt/badge/?version=latest
    :target: https://django-nyt.readthedocs.io/en/latest/?badge=latest
    :alt: Documentation Status

README.rst

@@ -19,6 +19,7 @@
 
 
 settings.configure(
+    SECRET_KEY="lskfjklsdfjalkfslfjslfksdjfslkfslkfj",
     DEBUG=True,
     # AUTH_USER_MODEL='testdata.CustomUser',
     DATABASES={

runtests.py

@@ -17,7 +17,7 @@
     keywords=["django", "notification" "alerts"],
     packages=find_packages(),
     zip_safe=False,
-    install_requires=["django>=2.2,<3.2"],
+    install_requires=["django>=2.2,<3.3"],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -32,7 +32,8 @@
         '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',
         'Programming Language :: Python :: 3 :: Only',
     ],
     include_package_data=True,

setup.py

@@ -1,48 +1,37 @@
 [tox]
 # Ensure you add to .travis.yml if you add here
-envlist = {py35,py36,py37,py38,pypy}-django{22,30,31}
-
-[travis]
-python =
-  3.5: py35
-  3.6: py36,lint
-  3.7: py37
-  3.8: py38
-  pypy: py
-
-[travis:env]
-DJANGO =
-  2.1: django21
-  2.2: django22
-  3.0: django30
-  3.1: django31
-LINT =
-  yes: lint
+envlist = {py35,py36,py37,py38,py39,pypy}-django{22,30,31,32}
 
 [testenv]
+passenv = CODECOV_TOKEN
+
 whitelist_externals=
   sh
 
 commands =
   sh -c '! python test-project/manage.py makemigrations --dry-run --exit --noinput'
   python -W all:"":"":"":0 -m coverage run --source=django_nyt runtests.py
+  codecov
 
 deps =
   coverage
+  codecov
   django21: Django>=2.1,<2.2
   django22: Django>=2.2,<2.3
   django30: Django>=3.0,<3.1
   django31: Django>=3.1,<3.2
+  django32: Django>=3.2,<3.3
 
 basepython =
   py35: python3.5
   py36: python3.6
   py37: python3.7
   py38: python3.8
+  py39: python3.9
   pypy: python
 
 [testenv:lint]
-basepython = python3.6
+basepython = python3
 deps = flake8
 commands =
   flake8 django_nyt