Merge pull request #1 from aws/master

Pull latest upstream changes

Author: jrbeilke

.changes/1.16.0.json

@@ -0,0 +1,25 @@
+{
+  "schema-version": "1.0",
+  "changes": [
+    {
+      "type": "enhancement",
+      "category": "local",
+      "description": "Avoid error from cognito client credentials in local authorizer (#1447)"
+    },
+    {
+      "type": "bugfix",
+      "category": "package",
+      "description": "Traverse symlinks to directories when packaging the vendor directory (#583)."
+    },
+    {
+      "type": "feature",
+      "category": "DomainName",
+      "description": "Add support for custom domain names to REST/WebSocket APIs (#1194)"
+    },
+    {
+      "type": "feature",
+      "category": "auth",
+      "description": "Add support for oauth scopes on routes (#1444)."
+    }
+  ]
+}

.changes/1.17.0.json

@@ -0,0 +1,25 @@
+{
+  "schema-version": "1.0",
+  "changes": [
+    {
+      "type": "feature",
+      "category": "Testing",
+      "description": "Add Chalice test client (#1468)"
+    },
+    {
+      "type": "enhancement",
+      "category": "regions",
+      "description": "Add support for non `aws` partitions including aws-cn and aws-us-gov (#792)."
+    },
+    {
+      "type": "bugfix",
+      "category": "dependencies",
+      "description": "Fix error when using old versions of click by requiring >=7"
+    },
+    {
+      "type": "bugfix",
+      "category": "local",
+      "description": "Fix local mode builtin authorizer not stripping query string from URL (#1470)"
+    }
+  ]
+}

.pylintrc

@@ -9,7 +9,7 @@
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=compat.py
+ignore=compat.py,regions.py
 
 # Pickle collected data for later comparisons.
 persistent=yes

CHANGELOG.rst

@@ -2,6 +2,24 @@
 CHANGELOG
 =========
 
+1.17.0
+======
+
+* feature:Testing:Add Chalice test client (#1468)
+* enhancement:regions:Add support for non `aws` partitions including aws-cn and aws-us-gov (#792).
+* bugfix:dependencies:Fix error when using old versions of click by requiring >=7
+* bugfix:local:Fix local mode builtin authorizer not stripping query string from URL (#1470)
+
+
+1.16.0
+======
+
+* enhancement:local:Avoid error from cognito client credentials in local authorizer (#1447)
+* bugfix:package:Traverse symlinks to directories when packaging the vendor directory (#583).
+* feature:DomainName:Add support for custom domain names to REST/WebSocket APIs (#1194)
+* feature:auth:Add support for oauth scopes on routes (#1444).
+
+
 1.15.1
 ======
 
@@ -290,7 +308,7 @@ code used in Chalice.  This is a backwards compatible change
 for users, but you may see changes to the autogenerated
 files Chalice creates.
 Please read the `upgrade notes for 1.2.0
-<http://aws.github.io/chalice/upgrading.html#v1-2-0>`__
+<http://chalice.readthedocs.io/en/latest/upgrading.html#v1-2-0>`__
 for more detailed information about upgrading to this release.
 
 
@@ -430,7 +448,7 @@ for more detailed information about upgrading to this release.
 
 
 Please read the `upgrade notes for 1.0.0b2
-<http://aws.github.io/chalice/upgrading.html#v1-0-0b2>`__
+<http://chalice.readthedocs.io/en/latest/upgrading.html#v1-0-0b2>`__
 for more detailed information about upgrading to this release.
 
 Note: to install this beta version of chalice you must specify
@@ -458,7 +476,7 @@ use the ``--pre`` flag for pip: ``pip install --pre chalice``.
 
 
 Please read the `upgrade notes for 1.0.0b1
-<http://aws.github.io/chalice/upgrading.html#v1-0-0b1>`__
+<http://chalice.readthedocs.io/en/latest/upgrading.html#v1-0-0b1>`__
 for more detailed information about upgrading to this release.
 
 Note: to install this beta version of chalice you must specify
@@ -583,7 +601,7 @@ use the ``--pre`` flag for pip: ``pip install --pre chalice``.
 
 
 Check out the `upgrade notes for 0.6.0
-<http://aws.github.io/chalice/upgrading.html#v0-6-0>`__
+<http://chalice.readthedocs.io/en/latest/upgrading.html#v0-6-0>`__
 for more detailed information about changes in this release.
 
 

Makefile

@@ -6,14 +6,14 @@ TESTS=tests/unit tests/functional tests/integration
 check:
 	###### FLAKE8 #####
 	# No unused imports, no undefined vars,
-	flake8 --ignore=E731,W503,W504 --exclude chalice/__init__.py,chalice/compat.py --max-complexity 10 chalice/
+	flake8 --ignore=E731,W503,W504 --exclude chalice/__init__.py,chalice/compat.py,chalice/vendored/botocore/regions.py --max-complexity 10 chalice/
 	flake8 --ignore=E731,W503,W504,F401 --max-complexity 10 chalice/compat.py
 	flake8 tests/unit/ tests/functional/ tests/integration tests/aws
 	#
 	# Proper docstring conventions according to pep257
 	#
 	#
-	pydocstyle --add-ignore=D100,D101,D102,D103,D104,D105,D204,D301 chalice/
+	pydocstyle --add-ignore=D100,D101,D102,D103,D104,D105,D204,D301 --match='(?!(test_|regions)).*\.py' chalice/
 
 pylint:
 	###### PYLINT ######
@@ -44,7 +44,7 @@ doccheck:
 	#
 	# TODO: Remove doc8
 	##
-	doc8 docs/source --ignore-path docs/source/topics/multifile.rst --ignore-path docs/source/tutorials/websockets.rst
+	doc8 docs/source --ignore-path docs/source/topics/multifile.rst
 	#
 	#
 	# Verify we have no broken external links