Merge branch 'master' into fix_get_client_id

.appveyor.yml

@@ -0,0 +1,26 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27"
+      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_ARCH: "64"
+    - PYTHON: "C:\\Python34"
+      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_ARCH: "64"
+    - PYTHON: "C:\\Python35"
+      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_ARCH: "64"
+    - PYTHON: "C:\\Python36"
+      PYTHON_ARCH: "32"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_ARCH: "64"
+
+build: off
+
+install:
+  - "%PYTHON%\\python.exe -m pip install .[testing]"
+
+test_script:
+  - "%PYTHON%\\python.exe -m pytest tests/ -m \"not network\""

.travis.yml

@@ -2,6 +2,8 @@ language: python
 
 sudo: false
 
+python: 3.6
+
 addons:
   apt:
     packages:
@@ -12,20 +14,18 @@ addons:
 install:
   - pip install tox
 
+env:
+   - TOXENV=py27
+   - TOXENV=py34
+   - TOXENV=py36
+   - TOXENV=quality
+   - TOXENV=docs
+
+# Everything behaves under python 3.6 except python3.5
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 3.4
-      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
-    - python: 3.6
-      env: TOXENV=py36
-    - python: 3.6
-      env: TOXENV=quality
-    - python: 3.6
-      env: TOXENV=docs
 
 script:
   - tox -e $TOXENV

CHANGELOG.md

@@ -8,7 +8,14 @@ The format is based on the [KeepAChangeLog] project.
 ## 0.13.0 [Unreleased]
 
 ### Added
+- [#469] Allow endpoints to have query parts
 - [#443] Ability to specify additional supported claims for oic.Provider
+- [#134] Added method kwarg to registration_endpoint that enables the client to read/modify registration
+
+### Changed
+- [#134] ``l_registration_enpoint`` has been deprecated, use ``create_registration`` instead
+- [#457] pyldap is now an optional dependency. ``oic.utils.authn.ldapc`` and ``oic.utils.userinfo.ldap_info`` raise
+         ``ImportError`` on import if ``pyldap`` is not present
 
 ### Fixed
 - [#430] Audience of a client assertion is endpoint dependent.
@@ -18,6 +25,7 @@ The format is based on the [KeepAChangeLog] project.
 - [#446] Fixed provider.read_registration
 - [#449] Fixed creation of error_response on client registration
 - [#445] Fixed get_client_id
+- [#145] Successful token endpoint responses have correct no-cache headers
 
 [#430]: https://github.com/OpenIDC/pyoidc/pull/430
 [#427]: https://github.com/OpenIDC/pyoidc/pull/427
@@ -27,6 +35,9 @@ The format is based on the [KeepAChangeLog] project.
 [#446]: https://github.com/OpenIDC/pyoidc/issues/446
 [#449]: https://github.com/OpenIDC/pyoidc/issues/449
 [#445]: https://github.com/OpenIDC/pyoidc/issues/445
+[#134]: https://github.com/OpenIDC/pyoidc/issues/134
+[#457]: https://github.com/OpenIDC/pyoidc/issues/457
+[#145]: https://github.com/OpenIDC/pyoidc/issues/145
 
 ## 0.12.0 [2017-09-25]
 

Pipfile

@@ -10,7 +10,7 @@ mock = "*"
 pylama = "*"
 pytest = "*"
 pytest-cov = "*"
-responses = "==0.6.0"
+responses = "*"
 sphinx-autobuild = "*"
 testfixtures = "*"
 tox = "*"
@@ -23,7 +23,6 @@ cryptography = "*"
 future = "*"
 pyOpenSSL = "*"
 pyjwkest = "*"
-pyldap = "*"
 requests = "*"
 Beaker = "*"
 Mako = "*"