mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-04 14:31:46 +00:00
python 3.4 no longer supported (EOL)
This commit is contained in:
@@ -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"""
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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'
|
||||
|
||||
2
setup.py
2
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)',
|
||||
],
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user