improve testing.

- Check coverage for models
- Fix twine check for long description
- Use Python 3.7 for coverage and packaging checks
- Remove claims about 2.7 support

Author: merwok

.circleci/config.yml

@@ -6,7 +6,6 @@ workflows:
     jobs:
       - test-py37
       - test-py36
-      - test-py27
       - check
 
 jobs:
@@ -26,9 +25,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - rest-auth-toolkit-py37-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-            - rest-auth-toolkit-py37-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}
-            - rest-auth-toolkit-py37-v2-{{ arch }}-
+            - rest-auth-toolkit-py37-v5-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+            - rest-auth-toolkit-py37-v5-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+            - rest-auth-toolkit-py37-v5-{{ arch }}-{{ checksum "requirements-test.txt" }}
+            - rest-auth-toolkit-py37-v5-{{ arch }}-
       - run:
           name: Install CI tools
           command: |
@@ -37,8 +37,11 @@ jobs:
       - run:
           name: Test with Python 3.7
           command: venv/bin/tox -e py37
+      - run:
+          name: Check coverage with Python 3.7
+          command: venv/bin/tox -e coverage
       - save_cache:
-          key: rest-auth-toolkit-py37-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+          key: rest-auth-toolkit-py37-v5-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
           paths:
             - venv
             - .tox
@@ -58,9 +61,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
+            - rest-auth-toolkit-py36-v3-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
             - rest-auth-toolkit-py36-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-            - rest-auth-toolkit-py36-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}
-            - rest-auth-toolkit-py36-v2-{{ arch }}-
+            - rest-auth-toolkit-py36-v3-{{ arch }}-{{ checksum "requirements-test.txt" }}
+            - rest-auth-toolkit-py36-v3-{{ arch }}-
       - run:
           name: Install CI tools
           command: |
@@ -70,63 +74,29 @@ jobs:
           name: Test with Python 3.6
           command: venv/bin/tox -e py36
       - save_cache:
-          key: rest-auth-toolkit-py36-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-          paths:
-            - venv
-            - .tox
-
-  test-py27:
-    docker:
-      # This image contains Python 3.6 (to install flit) and 2.7 (to run tests)
-      - image: circleci/python:3.6
-      - image: circleci/postgres:9.6-alpine
-        environment:
-          POSTGRES_DB: circle_test
-          POSTGRES_USER: testapp
-          POSTGRES_PASSWORD: ""
-    working_directory: ~/rest-auth-toolkit
-    environment:
-      DATABASE_URL: postgres://testapp@localhost/circle_test
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - rest-auth-toolkit-py27-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}
-            - rest-auth-toolkit-py27-v2-{{ arch }}-
-      - run:
-          name: Install CI tools
-          command: |
-            python3.6 -m venv venv
-            venv/bin/pip install tox
-      - run:
-          name: Test with Python 2.7
-          command: |
-            venv/bin/tox --sdistonly
-            venv/bin/tox -e py27
-      - save_cache:
-          key: rest-auth-toolkit-py27-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}
+          key: rest-auth-toolkit-py36-v3-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
           paths:
             - venv
             - .tox
 
   check:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.7
     working_directory: ~/rest-auth-toolkit
     steps:
       - checkout
       - restore_cache:
-          key: rest-auth-toolkit-check-v3
+          key: rest-auth-toolkit-check-v5
       - run:
           name: Install CI tools
           command: |
-            python3.6 -m venv venv
+            python3.7 -m venv venv
             venv/bin/pip install tox
       - run:
           name: Check packaging and dependencies
           command: venv/bin/tox -e pkg
       - save_cache:
-          key: rest-auth-toolkit-check-v3
+          key: rest-auth-toolkit-check-v5
           paths:
             - venv
             - .tox

pyproject.toml

@@ -13,7 +13,6 @@ classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",

requirements-test.txt

@@ -4,3 +4,5 @@ pytest
 pytest-env
 pytest-django
 pytest-pythonpath
+
+coverage

tox.ini

@@ -10,21 +10,21 @@ passenv =
 commands =
     pip install -r requirements-test.txt -r demo/requirements.txt
     flake8 rest_auth_toolkit tests demo
-    pytest
+    pytest {posargs}
 
-[testenv:py27]
-# can be removed if flit #218 is addressed
-install_command = python -m pip install --no-build-isolation {opts} {packages}
+[testenv:coverage]
+basepython = python3.7
 commands =
-    pip install -r requirements-test.txt
-    flake8 rest_auth_toolkit tests demo
-    # skip tests for now, 2.7 can't install django 2 and auth migrations are different
+    pip install -r requirements-test.txt -r demo/requirements.txt
+    coverage run -m pytest -qq {posargs}
+    coverage report
 
 [testenv:pkg]
-basepython = python3.6
+basepython = python3.7
 deps =
     flit
     twine
+    readme_renderer[md]
     safety >= 1.8.4
 commands =
     flit build
@@ -46,6 +46,17 @@ norecursedirs =
     migrations
     templates
 
+[coverage:run]
+source = rest_auth_toolkit/models.py, rest_auth_toolkit/managers.py, tests
+branch = 1
+
+[coverage:report]
+skip_covered = 1
+show_missing = 1
+fail_under = 100
+exclude_lines =
+    pragma: no cover
+
 [flake8]
 max-line-length = 89
 exclude = .git,.tox,__pycache__,migrations,templates