mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 00:03:28 +01:00
requirements: Adjust installation of PyAMF module.
* requirements.txt (Py3AMF, pyAMF): Move extra requirements from setup.py to here with conditions. * setup.py (load_requirements): Remove condition to install Py3AMF, pyAMF.
This commit is contained in:
parent
97fffe3a34
commit
7b819944c5
@ -18,3 +18,5 @@ tldextract
|
|||||||
python-dateutil
|
python-dateutil
|
||||||
markupsafe>=2.1.1
|
markupsafe>=2.1.1
|
||||||
ua_parser
|
ua_parser
|
||||||
|
Py3AMF; python_version >= '3.0'
|
||||||
|
pyAMF; python_version < '3.0'
|
||||||
|
5
setup.py
5
setup.py
@ -62,11 +62,6 @@ def generate_git_hash_py(pkg, filename='git_hash.py'):
|
|||||||
def load_requirements(filename):
|
def load_requirements(filename):
|
||||||
with open(filename, 'rt') as fh:
|
with open(filename, 'rt') as fh:
|
||||||
requirements = fh.read().rstrip().split('\n')
|
requirements = fh.read().rstrip().split('\n')
|
||||||
if sys.version_info > (3, 0):
|
|
||||||
requirements.append("py3AMF")
|
|
||||||
else:
|
|
||||||
requirements.append("pyAMF")
|
|
||||||
return requirements
|
|
||||||
|
|
||||||
|
|
||||||
def get_package_data():
|
def get_package_data():
|
||||||
|
Loading…
x
Reference in New Issue
Block a user