From bb4a1c0cf07d80b096a413c2be14ca7307cd6a69 Mon Sep 17 00:00:00 2001 From: Jon Michael Aanes Date: Wed, 22 May 2024 23:21:29 +0200 Subject: [PATCH] Fixed setup --- .../fetchers/defi_partisia_blockchain.py | 10 ++++-- requirements.txt | 9 ----- setup.py | 34 +++++++++++++++++-- 3 files changed, 39 insertions(+), 14 deletions(-) delete mode 100644 requirements.txt diff --git a/personal_data/fetchers/defi_partisia_blockchain.py b/personal_data/fetchers/defi_partisia_blockchain.py index ee70dbf..cf1dca4 100644 --- a/personal_data/fetchers/defi_partisia_blockchain.py +++ b/personal_data/fetchers/defi_partisia_blockchain.py @@ -53,7 +53,10 @@ class PbcClient: session: requests.Session def get_json( - self, url: str, data: Mapping[str, str] = frozendict(), method='POST', + self, + url: str, + data: Mapping[str, str] = frozendict(), + method='POST', ) -> tuple[dict, datetime.datetime]: headers = { 'Content-Type': 'application/json', @@ -61,7 +64,10 @@ class PbcClient: } response = self.session.request( - method, url, headers=headers, data=json.dumps(data), + method, + url, + headers=headers, + data=json.dumps(data), ) response.raise_for_status() date_text = response.headers.get('last-modified') or response.headers.get( diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index c1784cd..0000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -beautifulsoup4 -lxml -requests -requests_cache -browsercookie -cfscrape -frozendict -python-kucoin -krakenex diff --git a/setup.py b/setup.py index 0aa309e..6bfe5f1 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ from setuptools import setup PACKAGE_NAME = 'personal_data' + with open('README.md') as f: readme = f.read() @@ -14,8 +15,14 @@ with open(PACKAGE_NAME + '/_version.py') as f: version = match.group(2) del match, text -with open('requirements.txt') as f: - install_requires = f.read().strip().split('\n') + +def parse_requirements(text: str) -> list[str]: + return text.strip().split('\n') + + +def read_requirements(path: str): + with open(path) as f: + return parse_requirements(f.read()) def get_short_description(readme: str): @@ -28,6 +35,23 @@ def get_short_description(readme: str): raise Exception(msg) from err +REQUIREMENTS_MAIN = """ +beautifulsoup4 +lxml +requests +requests_cache +browsercookie +cfscrape +frozendict +python-kucoin +krakenex +""" + +REQUIREMENTS_TEST = """ +pytest +""" + + setup( name=PACKAGE_NAME, version=version, @@ -38,5 +62,9 @@ setup( author_email='jonjmaa@gmail.com', url='https://gitfub.space/Jmaa/' + PACKAGE_NAME, packages=[PACKAGE_NAME], - install_requires=install_requires, + install_requires=parse_requirements(REQUIREMENTS_MAIN), + extras_require={ + 'test': parse_requirements(REQUIREMENTS_TEST), + }, + python_requires='>=3.9', )