From bf4eb61b5c89590c10ba84fed6f992b69e509863 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Tue, 17 Dec 2019 18:43:01 +0100 Subject: [PATCH 1/7] new release cycle --- CHANGES.md | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 08e46b7..b49e8ad 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## 0.2.1 (2019-XX-XX) + +- (TBD) + ## 0.2.0 (2019-12-17) - FEATURE: `wenv init` can be used offline. A cache for installation files was added, see #1. `wenv cache` fills the cache automatically (internet connection required), `WENV_OFFLINE=true wenv init` runs the initialization of the actual *Wine Python environment* offline. Offline functionality can be configured through the new configuration parameters `prefix`, `offline`, `cache` and `packages`. See #1. diff --git a/setup.py b/setup.py index 4a0e1e9..259a6b4 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ # Bump version HERE! -_version_ = '0.2.0' +_version_ = '0.2.1' # List all versions of Python which are supported From 10ea87f2928afed337e22744715fe2ba0541715a Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:34:33 +0200 Subject: [PATCH 2/7] python_requires --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 259a6b4..c038c85 100644 --- a/setup.py +++ b/setup.py @@ -47,9 +47,11 @@ # List all versions of Python which are supported +python_minor_min = 4 +python_minor_max = 8 confirmed_python_versions = [ - ('Programming Language :: Python :: %s' % x) - for x in '3.4 3.5 3.6 3.7 3.8'.split() + 'Programming Language :: Python :: 3.{MINOR:d}'.format(MINOR = minor) + for minor in range(python_minor_min, python_minor_max + 1) ] @@ -79,6 +81,7 @@ keywords = ['wine', 'cross platform'], scripts = [], include_package_data = True, + python_requires = '>=3.{MINOR:d}'.format(MINOR = python_minor_min), install_requires = [ 'requests' ], From c4ecd3291d3b1f95ade56e813e1db64e0c1598a4 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:35:43 +0200 Subject: [PATCH 3/7] python 3.4 test / CI fix --- setup.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c038c85..f04ca8a 100644 --- a/setup.py +++ b/setup.py @@ -65,6 +65,13 @@ raise SystemExit('You are already running Windows. No need for this package!') +# Python 3.4 dependency / CI fix +pls = 'python-language-server' +assert version_info.major == 3 +if version_info.minor <= 4: + pls += '<0.32.0' + + setup( name = 'wenv', packages = find_packages('src'), @@ -90,7 +97,7 @@ 'pytest', 'coverage', 'pytest-cov', - 'python-language-server', + pls, 'setuptools', 'Sphinx', 'sphinx_rtd_theme', From 0b8cd843d41c7369465da26dc034c7ed539f4041 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:38:03 +0200 Subject: [PATCH 4/7] update copyright --- docs/Makefile | 2 +- docs/conf.py | 2 +- makefile | 2 +- setup.py | 2 +- src/wenv/__init__.py | 2 +- src/wenv/__main__.py | 2 +- src/wenv/_core/__init__.py | 2 +- src/wenv/_core/config.py | 2 +- src/wenv/_core/const.py | 2 +- src/wenv/_core/env.py | 2 +- src/wenv/_core/errors.py | 2 +- src/wenv/_core/source.py | 2 +- tests/__init__.py | 2 +- tests/lib/__init__.py | 2 +- tests/lib/const.py | 2 +- tests/lib/param.py | 2 +- tests/test_init.py | 2 +- tests/test_pip.py | 2 +- tests/test_python.py | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 041c667..dfbbd15 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -4,7 +4,7 @@ # # docs/makefile: GNU makefile for building the documentation # -# Copyright (C) 2017-2019 Sebastian M. Ernst +# Copyright (C) 2017-2020 Sebastian M. Ernst # # # The contents of this file are subject to the GNU Lesser General Public License diff --git a/docs/conf.py b/docs/conf.py index cd5ae21..476ee98 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -9,7 +9,7 @@ docs/conf.py: Configures the documentation build process - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/makefile b/makefile index 559285b..f5f98b4 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,7 @@ # # makefile: GNU makefile for project management # -# Copyright (C) 2017-2019 Sebastian M. Ernst +# Copyright (C) 2017-2020 Sebastian M. Ernst # # # The contents of this file are subject to the GNU Lesser General Public License diff --git a/setup.py b/setup.py index f04ca8a..256485d 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup.py: Used for package distribution - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/__init__.py b/src/wenv/__init__.py index 7a3d1ae..c29302c 100644 --- a/src/wenv/__init__.py +++ b/src/wenv/__init__.py @@ -8,7 +8,7 @@ src/wenv/__init__.py: Package init file - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/__main__.py b/src/wenv/__main__.py index c0064cb..d77bf8e 100644 --- a/src/wenv/__main__.py +++ b/src/wenv/__main__.py @@ -8,7 +8,7 @@ src/wenv/__init__.py: Package entry point - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/__init__.py b/src/wenv/_core/__init__.py index fed64be..fe70f96 100644 --- a/src/wenv/_core/__init__.py +++ b/src/wenv/_core/__init__.py @@ -8,7 +8,7 @@ src/wenv/_core/__init__.py: Core module - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/config.py b/src/wenv/_core/config.py index 4f1c2b2..9ac4f12 100644 --- a/src/wenv/_core/config.py +++ b/src/wenv/_core/config.py @@ -8,7 +8,7 @@ src/wenv/_core/config.py: Handles the modules configuration - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/const.py b/src/wenv/_core/const.py index da6faca..043d356 100644 --- a/src/wenv/_core/const.py +++ b/src/wenv/_core/const.py @@ -8,7 +8,7 @@ src/wenv/_core/const.py: Holds constant values, flags, types - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/env.py b/src/wenv/_core/env.py index 30f1a78..4af12bc 100644 --- a/src/wenv/_core/env.py +++ b/src/wenv/_core/env.py @@ -8,7 +8,7 @@ src/wenv/_core/env.py: Managing a Wine-Python environment - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/errors.py b/src/wenv/_core/errors.py index bd2ed64..f526e50 100644 --- a/src/wenv/_core/errors.py +++ b/src/wenv/_core/errors.py @@ -8,7 +8,7 @@ src/wenv/_core/errors.py: Exceptions - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/src/wenv/_core/source.py b/src/wenv/_core/source.py index dce87a0..7a11b86 100644 --- a/src/wenv/_core/source.py +++ b/src/wenv/_core/source.py @@ -8,7 +8,7 @@ src/wenv/_core/source.py: Obtaining Python and pip locally or remotely - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/__init__.py b/tests/__init__.py index 7678a4e..66229fa 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -8,7 +8,7 @@ tests/__init__.py: Test module - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index eb091d1..b3d2e91 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -8,7 +8,7 @@ tests/lib/__init__.py: Test library module - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/lib/const.py b/tests/lib/const.py index 4227870..160a732 100644 --- a/tests/lib/const.py +++ b/tests/lib/const.py @@ -8,7 +8,7 @@ tests/lib/const.py: Holds constant values, flags, types - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/lib/param.py b/tests/lib/param.py index b306ebd..36b482d 100644 --- a/tests/lib/param.py +++ b/tests/lib/param.py @@ -8,7 +8,7 @@ tests/lib/const.py: Holds constant values, flags, types - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/test_init.py b/tests/test_init.py index 84b376e..4fdd787 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -8,7 +8,7 @@ tests/test_init.py: Testing clean & init - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/test_pip.py b/tests/test_pip.py index 364a327..d47ec9b 100644 --- a/tests/test_pip.py +++ b/tests/test_pip.py @@ -8,7 +8,7 @@ tests/test_util.py: Testing pip - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License diff --git a/tests/test_python.py b/tests/test_python.py index 34b7d5c..54c99b4 100644 --- a/tests/test_python.py +++ b/tests/test_python.py @@ -8,7 +8,7 @@ tests/test_util.py: Testing Python interpreter - Copyright (C) 2017-2019 Sebastian M. Ernst + Copyright (C) 2017-2020 Sebastian M. Ernst The contents of this file are subject to the GNU Lesser General Public License From 0e2a4e11ee07640feebb0475522faf55fc99c2c2 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:39:32 +0200 Subject: [PATCH 5/7] logged changes --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b49e8ad..3e6bd54 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,8 @@ # Changes -## 0.2.1 (2019-XX-XX) +## 0.2.1 (2020-XX-XX) -- (TBD) +- FIX: CI tests failed due to dependency issue in Python 3.4, see issue #13. ## 0.2.0 (2019-12-17) From b0a35766baff566702560811e951006d5df99bf6 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:45:40 +0200 Subject: [PATCH 6/7] fix: added version_info import --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 256485d..94dacb7 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup ) import os -from sys import platform +from sys import platform, version_info # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From 40310e73c6ad66e849e4d55740e3aa0dcde79da2 Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 10 Jul 2020 19:57:13 +0200 Subject: [PATCH 7/7] prepare for release --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 3e6bd54..7ee8cb3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## 0.2.1 (2020-XX-XX) +## 0.2.1 (2020-07-10) - FIX: CI tests failed due to dependency issue in Python 3.4, see issue #13.