diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 7686e3f..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include scrapingant_client/VERSION diff --git a/README.md b/README.md index 8e8f386..d1af5c9 100644 --- a/README.md +++ b/README.md @@ -130,5 +130,5 @@ print(result.content) ``` ## Useful links -- [Scrapingant Api doumentation](https://docs.scrapingant.com) -- [Scrapingant Js Client](https://github.com/scrapingant/scrapingant-client-js) +- [Scrapingant API doumentation](https://docs.scrapingant.com) +- [Scrapingant JS Client](https://github.com/scrapingant/scrapingant-client-js) diff --git a/scrapingant_client/VERSION b/scrapingant_client/VERSION deleted file mode 100644 index 9fc80f9..0000000 --- a/scrapingant_client/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.3.2 \ No newline at end of file diff --git a/scrapingant_client/__init__.py b/scrapingant_client/__init__.py index 84ee848..e531cd4 100644 --- a/scrapingant_client/__init__.py +++ b/scrapingant_client/__init__.py @@ -1,3 +1,5 @@ +__version__ = "0.3.3" + from scrapingant_client.client import ScrapingAntClient from scrapingant_client.cookie import Cookie from scrapingant_client.errors import ( diff --git a/scrapingant_client/client.py b/scrapingant_client/client.py index 9255c8e..dacbb7f 100644 --- a/scrapingant_client/client.py +++ b/scrapingant_client/client.py @@ -1,10 +1,10 @@ -import os import platform import sys from typing import List, Optional import requests +import scrapingant_client from scrapingant_client.constants import SCRAPINGANT_API_BASE_URL from scrapingant_client.cookie import Cookie, cookies_list_to_string, cookies_list_from_string from scrapingant_client.errors import ( @@ -20,8 +20,7 @@ class ScrapingAntClient: def __init__(self, token: str): self.token = token self.requests_session = requests.Session() - version_file = open(os.path.join('scrapingant_client', 'VERSION')) - version = version_file.read().strip() + version = scrapingant_client.__version__ user_agent = f'ScrapingAnt Client/{version} ({sys.platform}; Python/{platform.python_version()});' self.requests_session.headers.update({ 'x-api-key': self.token, diff --git a/setup.py b/setup.py index b955218..a580816 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,15 @@ import os +import pathlib +import re import setuptools with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() -version_file = open(os.path.join('scrapingant_client', 'VERSION')) -version = version_file.read().strip() +HERE = pathlib.Path(__file__).parent +txt = (HERE / "scrapingant_client" / "__init__.py").read_text("utf-8") +version = re.findall(r'^__version__ = "([^"]+)"\r?$', txt, re.M)[0] setuptools.setup( name="scrapingant-client", @@ -40,5 +43,4 @@ 'responses>=0,<1' ] }, - include_package_data=True, )