Merged

Author: rohe

.isort.cfg

@@ -0,0 +1,6 @@
+[settings]
+force_single_line = 1
+known_first_party = oidcmsg
+known_third_party = cryptojwt,pytest
+known_future_library = future,past
+default_section = THIRDPARTY

.travis.yml

@@ -1,10 +1,28 @@
 language: python
-python:
-  - "3.5"
-  - "3.6"
-# command to install dependencies
+
+sudo: false
+
+python: 3.6
+
 install:
-  - pip install -r requirements.txt
-# command to run tests
+  - pip install tox
+
+env:
+   - TOXENV=py34
+   - TOXENV=py35
+   - TOXENV=py36
+   - TOXENV=py37
+   - TOXENV=quality
+   - TOXENV=docs
+
+# Everything behaves under python 3.6 except python3.5
+matrix:
+  include:
+    - python: 3.5
+      env: TOXENV=py35
+    - env: TOXENV=isort-check
 script:
-  - pytest # or py.test for Python versions 3.5 and below
+  - tox -e $TOXENV
+
+notifications:
+  email: false

pylama.ini

@@ -2,4 +2,4 @@
 max_line_length = 120
 
 [pylama:mccabe]
-complexity = 40
+complexity = 32

requirements.txt

@@ -37,11 +37,7 @@ def run_tests(self):
         sys.exit(errno)
 
 
-# Python 2.7 and later ship with importlib and argparse
-if sys.version_info[0] == 2 and sys.version_info[1] == 6:
-    extra_install_requires = ["importlib", "argparse"]
-else:
-    extra_install_requires = []
+extra_install_requires = []
 
 with open('src/oidcmsg/__init__.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -60,7 +56,6 @@ def run_tests(self):
     classifiers=[
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",

setup.py

@@ -377,7 +377,7 @@ class AuthorizationRequest(oauth2.AuthorizationRequest):
             "redirect_uri": SINGLE_REQUIRED_STRING,
             "nonce": SINGLE_OPTIONAL_STRING,
             "display": SINGLE_OPTIONAL_STRING,
-            "prompt": OPTIONAL_LIST_OF_STRINGS,
+            "prompt": OPTIONAL_LIST_OF_SP_SEP_STRINGS,
             "max_age": SINGLE_OPTIONAL_INT,
             "ui_locales": OPTIONAL_LIST_OF_SP_SEP_STRINGS,
             "claims_locales": OPTIONAL_LIST_OF_SP_SEP_STRINGS,

src/oidcmsg/oidc/__init__.py

@@ -1,5 +1,4 @@
 import os
-
 import pytest
 from cryptojwt.jwk.rsa import RSAKey
 from cryptojwt.jws.exception import SignerAlgError

tests/test_2_jwt.py

@@ -1,8 +1,7 @@
 # pylint: disable=no-self-use,missing-docstring
-from urllib.parse import parse_qs
-from urllib.parse import urlparse
 
 import json
+from urllib.parse import urlparse, parse_qs
 
 import pytest
 

tests/test_5_oauth2.py

@@ -1,60 +1,30 @@
 [tox]
-envlist = py{27,34,36},docs,quality
+envlist = py{34,35,36},docs,quality
 
 [testenv]
-setenv =
-    COVERAGE_FILE = {toxinidir}/.coverage.{envname}
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+passenv = CI TRAVIS TRAVIS_*
 commands =
-    pipenv install --dev
-    pipenv run py.test --cov-report= --cov=oidc tests/ -m "not network" {posargs}
-    ; Transform absolute path to relative path for compatibility with coveralls.io and fix 'source not available' error.
-    pipenv run python -c "import os;cov_strip_abspath = open(os.environ['COVERAGE_FILE'], 'r').read().replace('.tox' + os.sep + os.path.relpath('{envsitepackagesdir}', '{toxworkdir}'), 'src');open(os.environ['COVERAGE_FILE'], 'w').write(cov_strip_abspath)"
-deps = pipenv
+    py.test --cov-report= --cov=oicmsg tests/ -m "not network" {posargs}
+    codecov
+extras = testing
+deps =
+  codecov
+  pytest-cov
 
 [testenv:docs]
 whitelist_externals = make
-deps = pipenv
-commands =
-  pipenv install --dev
-  make html
+extras = docs
+commands = sphinx-build -b html doc/ doc/_build/html -W
 
 [testenv:quality]
-whitelist_externals = make
-deps = pipenv
-commands =
-    pipenv install --dev
-    make check-isort
-    make check-pylama
-
-[testenv:coveralls]
-setenv =
-    COVERAGE_FILE = {toxinidir}/.coverage
-passenv =
-    *
-deps =
-    coverage
-    coveralls
-skip_install = true
-commands =
-    coverage combine
-    coveralls
-changedir = {toxinidir}
-
-[testenv:coverage-erase]
-setenv =
-    COVERAGE_FILE = {toxinidir}/.coverage
-passenv =
-    *
-deps =
-    coverage
-skip_install = true
+ignore_errors = True
+extras = quality
 commands =
-    coverage erase
-changedir = {toxinidir}
+    isort --recursive --diff --check-only src/ tests/
+    pylama src/ tests/
 
 [pep8]
 max-line-length=100
 
 [pytest]
-addopts = --color=yes
+addopts = --color=yes