Merge pull request #10 from ScrapingAnt/feature/issue7-fix-user-agent

feature/issue7-fix-user-agent: changed version file approach

Author: megabotan

MANIFEST.in

@@ -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)

README.md

@@ -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 (

scrapingant_client/VERSION

@@ -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,

scrapingant_client/__init__.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,
 )