From b9f3fbc77c57037d5e263d7a3b7494e4d15182eb Mon Sep 17 00:00:00 2001
From: Andreas Maier <maiera@de.ibm.com>
Date: Tue, 4 Sep 2018 09:59:23 +0200
Subject: [PATCH] Added support for Python 3.7.

Details:

* Added support for Python 3.7. This required increasing the minimum versions
  of several Python packages in order to pick up their Python 3.7 support:

  - `pyzmq` from 16.0.2 to 16.0.4 (While 16.0.4 works for this, only
    17.0.0 declares Python 3.6(!) support on Pypi, and Python 3.7 support is not
    officially declared on Pypi yet for this package).

  - `PyYAML` from 3.12 to 3.13 (see PyYAML issue
    https://github.com/yaml/pyyaml/issues/126).

* Added Python 3.7 jobs to Travis and Appveyor. Disabled the corresponding
  Python 3.6 runs, in exchange.

Signed-off-by: Andreas Maier <maiera@de.ibm.com>
---
 .travis.yml             | 14 +++++++++++++-
 appveyor.yml            | 10 ++++++++--
 dev-requirements.txt    |  2 +-
 docs/changes.rst        |  8 ++++++++
 minimum-constraints.txt |  4 ++--
 setup.cfg               |  1 +
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90ffd3d46..6dbe03530 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,10 +79,22 @@ matrix:
 #      python: "3.6"
 #      env:
 #        - PACKAGE_LEVEL=minimum
+#      cache: pip
+#    - os: linux
+#      language: python
+#      python: "3.6"
+#      env:
+#        - PACKAGE_LEVEL=latest
+#      cache: pip
+#    - os: linux
+#      language: python
+#      python: "3.7"
+#      env:
+#        - PACKAGE_LEVEL=minimum
 #      cache: pip
     - os: linux
       language: python
-      python: "3.6"
+      python: "3.7"
       env:
         - PACKAGE_LEVEL=latest
       cache: pip
diff --git a/appveyor.yml b/appveyor.yml
index 26bcb8e93..abff6b862 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,9 +24,15 @@ environment:
 #    - PYTHON_VERSION: 3.6
 #      PYTHON_ARCH: 32
 #      PYTHON_HOME: C:\Python36
-    - PYTHON_VERSION: 3.6
+#    - PYTHON_VERSION: 3.6
+#      PYTHON_ARCH: 64
+#      PYTHON_HOME: C:\Python36-x64
+#    - PYTHON_VERSION: 3.7
+#      PYTHON_ARCH: 32
+#      PYTHON_HOME: C:\Python37
+    - PYTHON_VERSION: 3.7
       PYTHON_ARCH: 64
-      PYTHON_HOME: C:\Python36-x64
+      PYTHON_HOME: C:\Python37-x64
 
 configuration:
 # These values will become the values of the PACKAGE_LEVEL env.var.
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e4b3f2653..cf02cf3d0 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -15,7 +15,7 @@
 # Direct dependencies:
 
 # zhmcclient examples (imports into the example scripts):
-PyYAML>=3.12 # MIT
+PyYAML>=3.13 # MIT
 
 # Unit test (imports into testcases):
 pytest>=3.0.5 # MIT
diff --git a/docs/changes.rst b/docs/changes.rst
index 75c695e9f..a45377970 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -35,6 +35,14 @@ Released: not yet
 * Docs: Streamlined, improved and fixed the description how to release a version
   and how to start a new version, in the development section of the documentation.
 
+* Added support for Python 3.7. This required increasing the minimum versions
+  of several Python packages in order to pick up their Python 3.7 support:
+  - `pyzmq` from 16.0.2 to 16.0.4 (While 16.0.4 works for this, only
+    17.0.0 declares Python 3.6(!) support on Pypi, and Python 3.7 support is not
+    officially declared on Pypi yet for this package).
+  - `PyYAML` from 3.12 to 3.13 (see PyYAML issue
+    https://github.com/yaml/pyyaml/issues/126).
+
 **Known issues:**
 
 * See `list of open issues`_.
diff --git a/minimum-constraints.txt b/minimum-constraints.txt
index 5c846c2b0..e6bebf4f0 100644
--- a/minimum-constraints.txt
+++ b/minimum-constraints.txt
@@ -63,7 +63,7 @@ urllib3==1.21.1
 # Direct dependencies for development (must be consistent with dev-requirements.txt)
 
 # zhmcclient examples (imports into the example scripts):
-PyYAML==3.12
+PyYAML==3.13
 
 # Unit test (imports into testcases):
 pytest==3.0.5
@@ -146,7 +146,7 @@ pycodestyle==2.2.0
 pyflakes==1.3.0
 Pygments==2.1.3
 python-dateutil==2.6.0
-pyzmq==16.0.2
+pyzmq==16.0.4
 qtconsole==4.2.1
 requests-toolbelt==0.7.0
 scandir==1.5
diff --git a/setup.cfg b/setup.cfg
index 4df268816..c5177c1f7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ classifier =
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =