From df9b56214d18be7add3b7701071644d37c8c7cae Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 6 Jun 2019 17:22:40 +0200 Subject: [PATCH] python 3.4 no longer supported (EOL) --- dotdrop/cfg_yaml.py | 6 +----- packages/arch-dotdrop-git/PKGBUILD | 2 +- requirements.txt | 6 +++--- setup.py | 2 +- tests-requirements.txt | 10 +++++----- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py index 48949bb..5320046 100644 --- a/dotdrop/cfg_yaml.py +++ b/dotdrop/cfg_yaml.py @@ -549,11 +549,7 @@ class CfgYaml: def _merge_dict(self, high, low): """merge low into high""" - # won't work in python3.4 - # return {**low, **high} - new = deepcopy(low) - new.update(high) - return new + return {**low, **high} def _get_entry(self, dic, key, mandatory=True): """return entry from yaml dictionary""" diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD index 67ecb31..28d762f 100644 --- a/packages/arch-dotdrop-git/PKGBUILD +++ b/packages/arch-dotdrop-git/PKGBUILD @@ -9,7 +9,7 @@ arch=('any') url="https://github.com/deadc0de6/dotdrop" license=('GPL') groups=() -depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') +depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-ruamel-yaml') makedepends=('git') provides=(dotdrop) conflicts=(dotdrop) diff --git a/requirements.txt b/requirements.txt index 2c6a2c7..212fe0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -Jinja2; python_version >= '3.0' -docopt; python_version >= '3.0' -ruamel.yaml; python_version >= '3.0' +Jinja2; python_version > '3.4' +docopt; python_version > '3.4' +ruamel.yaml; python_version > '3.4' diff --git a/setup.py b/setup.py index 455eb35..7c6153d 100644 --- a/setup.py +++ b/setup.py @@ -32,9 +32,9 @@ setup( python_requires=REQUIRES_PYTHON, classifiers=[ 'Development Status :: 5 - Production/Stable', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', ], diff --git a/tests-requirements.txt b/tests-requirements.txt index 2172e29..c2325bf 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,5 +1,5 @@ -pycodestyle; python_version >= '3.0' -nose; python_version >= '3.0' -coverage; python_version >= '3.0' -coveralls; python_version >= '3.0' -pyflakes; python_version >= '3.0' +pycodestyle; python_version > '3.4' +nose; python_version > '3.4' +coverage; python_version > '3.4' +coveralls; python_version > '3.4' +pyflakes; python_version > '3.4'