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.
webrecorder · Nov 6, 2024 · 7b81994 · 7b81994
1 parent 97fffe3
commit 7b81994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -18,3 +18,5 @@ tldextract
 python-dateutil
 markupsafe>=2.1.1
 ua_parser
+Py3AMF; python_version >= '3.0'
+pyAMF; python_version < '3.0'
diff --git a/setup.py b/setup.py
@@ -62,11 +62,6 @@ def generate_git_hash_py(pkg, filename='git_hash.py'):
 def load_requirements(filename):
     with open(filename, 'rt') as fh:
         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():