From 7b819944c5db59b21bc9755d7ce15b14e147d246 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 6 Nov 2024 20:06:37 +0000 Subject: [PATCH 1/3] 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. --- requirements.txt | 2 ++ setup.py | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index eb1b5d8f7..bbc4862bb 100644 --- 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 index b9f5a8cac..37893ec49 100755 --- 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(): From 5304f0b289fc105734f83bdef7270ab88350b9e7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 7 Nov 2024 09:30:28 +0000 Subject: [PATCH 2/3] fix: Return requirements after read. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 37893ec49..2e3a1973e 100755 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ 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') + return requirements def get_package_data(): From 496b92e724677cec600531ea5790ae92bc905287 Mon Sep 17 00:00:00 2001 From: Tessa Walsh Date: Thu, 7 Nov 2024 11:34:56 -0500 Subject: [PATCH 3/3] Update requirements.txt --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index bbc4862bb..1c2656d26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,5 +18,4 @@ tldextract python-dateutil markupsafe>=2.1.1 ua_parser -Py3AMF; python_version >= '3.0' -pyAMF; python_version < '3.0' +py3AMF