Merge branch 'master' into doc_changes

Author: nikhilym

ask-sdk-core/ask_sdk_core/__version__.py

@@ -24,6 +24,6 @@
 __author_email__ = '[email protected]'
 __license__ = 'Apache 2.0'
 __keywords__ = ['ASK SDK', 'Alexa Skills Kit', 'Alexa', 'Core']
-__install_requires__ = ["six", "requests", "python_dateutil",
-                        "ask-sdk-model", "ask-sdk-runtime"]
+__install_requires__ = ["requests", "python_dateutil",
+                        "ask-sdk-model>=1.0.0", "ask-sdk-runtime>=1.1.0"]
 

ask-sdk-core/setup.py

@@ -43,12 +43,6 @@
     license=about['__license__'],
     include_package_data=True,
     install_requires=about['__install_requires__'],
-    extras_require={
-        ':python_version == "2.7"': [
-            'enum34',
-            'typing',
-        ],
-    },
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,

ask-sdk-dynamodb-persistence-adapter/ask_sdk_dynamodb/__version__.py

@@ -26,4 +26,4 @@
 __license__ = 'Apache 2.0'
 __keywords__ = ['ASK SDK', 'Alexa Skills Kit', 'Alexa', 'ASK SDK Core',
                 'Persistence', 'DynamoDB']
-__install_requires__ = ["boto3", "ask-sdk-core"]
+__install_requires__ = ["boto3", "ask-sdk-core>=1.1.0"]

ask-sdk-dynamodb-persistence-adapter/setup.py

@@ -43,12 +43,6 @@
     license=about['__license__'],
     include_package_data=True,
     install_requires=about['__install_requires__'],
-    extras_require={
-        ':python_version == "2.7"': [
-            'enum34',
-            'typing',
-        ],
-    },
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,

ask-sdk-runtime/ask_sdk_runtime/__version__.py

@@ -25,5 +25,5 @@
 __author_email__ = '[email protected]'
 __license__ = 'Apache 2.0'
 __keywords__ = ['ASK SDK Runtime', 'Alexa Skills Kit', 'Alexa', 'Runtime']
-__install_requires__ = ["typing"]
+__install_requires__ = ["typing;python_version=='2.7'"]
 

ask-sdk-runtime/requirements.txt

@@ -1 +1 @@
-typing
+typing; python_version == '2.7'

ask-sdk-runtime/setup.py

@@ -43,11 +43,6 @@
     license=about['__license__'],
     include_package_data=True,
     install_requires=about['__install_requires__'],
-    extras_require={
-        ':python_version == "2.7"': [
-            'typing',
-        ],
-    },
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,

ask-sdk/ask_sdk/__version__.py

@@ -26,4 +26,4 @@
 __license__ = 'Apache 2.0'
 __keywords__ = ['ASK SDK', 'Alexa Skills Kit', 'Alexa', 'ASK SDK Core',
                 'Persistence', 'DynamoDB', 'ASK SDK Standard']
-__install_requires__ = ["ask-sdk-core", 'ask-sdk-dynamodb-persistence-adapter']
+__install_requires__ = ["ask-sdk-core>=1.1.0", "ask-sdk-dynamodb-persistence-adapter>=1.1.0"]

ask-sdk/setup.py

@@ -43,12 +43,6 @@
     license=about['__license__'],
     include_package_data=True,
     install_requires=about['__install_requires__'],
-    extras_require={
-        ':python_version == "2.7"': [
-            'enum34',
-            'typing',
-        ],
-    },
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,