From f0d6b9fa4518315b3c75ed2580f516ee116acf8c Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 16:51:43 +0200 Subject: [PATCH 1/4] limit pls version --- setup.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9528cf18..2a028e6c 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,13 @@ raise SystemExit('You are already running Windows. No need for this package!') +# Python 3.4 dependency / CI fix +pls = 'python-language-server' +assert sys.version_info.major == 3 +if sys.version_info.minor <= 4: + pls += '<0.32.0' + + setup( name = 'zugbruecke', packages = find_packages('src'), @@ -84,7 +91,7 @@ install_requires = [], extras_require = {'dev': [ 'pytest', - 'python-language-server', + pls, 'setuptools', 'Sphinx', 'sphinx_rtd_theme', From a237dcdc9f3b5ab58cbcc8baaeef892ca107a467 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 16:55:06 +0200 Subject: [PATCH 2/4] fix import --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2a028e6c..b67657ab 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ ) import os from glob import glob -from sys import platform +from sys import platform, version_info # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -68,8 +68,8 @@ # Python 3.4 dependency / CI fix pls = 'python-language-server' -assert sys.version_info.major == 3 -if sys.version_info.minor <= 4: +assert version_info.major == 3 +if version_info.minor <= 4: pls += '<0.32.0' From fbee39aefd5ca4916e638f2d0a377c1a87c05a5c Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 17:01:27 +0200 Subject: [PATCH 3/4] logged changes --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index f221d72c..aa678638 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changes ======= +0.0.15 (2020-07-10) +------------------- + +* FIX: CI tests failed due to dependency issue in Python 3.4, see issue #72. + 0.0.14 (2019-05-21) ------------------- From e0fb2e6e0511bcc4b8429824f4567c0f99a484fd Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 17:02:16 +0200 Subject: [PATCH 4/4] new version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b67657ab..0d97832f 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ # Bump version HERE! -_version_ = '0.0.14' +_version_ = '0.0.15' # List all versions of Python which are supported