mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-12 10:43:30 +00:00
Code Activity

python 3.4 no longer supported (EOL)

Browse Source
This commit is contained in:
deadc0de6
2019-06-06 17:22:40 +02:00
parent d008e6a895
commit df9b56214d
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dotdrop/cfg_yaml.py
View File

@@ -549,11 +549,7 @@ class CfgYaml:
def _merge_dict(self, high, low): def _merge_dict(self, high, low):
"""merge low into high""" """merge low into high"""
# won't work in python3.4 return {**low, **high}
# return {**low, **high}
new = deepcopy(low)
new.update(high)
return new
def _get_entry(self, dic, key, mandatory=True): def _get_entry(self, dic, key, mandatory=True):
"""return entry from yaml dictionary""" """return entry from yaml dictionary"""

2
packages/arch-dotdrop-git/PKGBUILD
View File

@@ -9,7 +9,7 @@ arch=('any')
url="https://github.com/deadc0de6/dotdrop" url="https://github.com/deadc0de6/dotdrop"
license=('GPL') license=('GPL')
groups=() groups=()
depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-pyaml') depends=('python' 'python-setuptools' 'python-jinja' 'python-docopt' 'python-ruamel-yaml')
makedepends=('git') makedepends=('git')
provides=(dotdrop) provides=(dotdrop)
conflicts=(dotdrop) conflicts=(dotdrop)

6
requirements.txt
View File

@@ -1,3 +1,3 @@
Jinja2; python_version >= '3.0' Jinja2; python_version > '3.4'
docopt; python_version >= '3.0' docopt; python_version > '3.4'
ruamel.yaml; python_version >= '3.0' ruamel.yaml; python_version > '3.4'

2
setup.py
View File

@@ -32,9 +32,9 @@ setup(
python_requires=REQUIRES_PYTHON, python_requires=REQUIRES_PYTHON,
classifiers=[ classifiers=[
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
], ],

10
tests-requirements.txt
View File

@@ -1,5 +1,5 @@
pycodestyle; python_version >= '3.0' pycodestyle; python_version > '3.4'
nose; python_version >= '3.0' nose; python_version > '3.4'
coverage; python_version >= '3.0' coverage; python_version > '3.4'
coveralls; python_version >= '3.0' coveralls; python_version > '3.4'
pyflakes; python_version >= '3.0' pyflakes; python_version > '3.4'