introduce setup.cfg

Author: mdujava

Pipfile

@@ -1,21 +1,21 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
 [dev-packages]
 black = "*"
 flake8 = "*"
 mypy = "*"
 pylint = "*"
-pytest = "*"
-python-dotenv = "*"
 responses = "*"
 types-requests = "*"
 
+python-dotenv = "*"
+pytest = "<9.0.0"
+
+#python-language-server = "*"
+#pyls-mypy = "*"
+#pyls-isort = "*"
+
 [packages]
 requests = "*"
-backoff = "*"
+python-backoff = "*"
 
 [requires]
 python_version = "3"

Pipfile.lock

@@ -0,0 +1,48 @@
+[metadata]
+name = 3scale-api
+version = 0.35.2
+description = 3scale API python client
+author = Peter Stanko
+author_email = stanko@mail.muni.cz
+maintainer = Matej Dujava
+maintainer_email = mdujava@redhat.com
+url = https://github.com/3scale-qe/3scale-api-python
+license = Apache-2.0
+license_files = LICENSE
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    Operating System :: OS Independent
+    Intended Audience :: Developers
+    Topic :: Utilities
+    Programming Language :: Python :: 3
+
+[options]
+packages = find:
+include_package_data = True
+install_requires =
+    requests
+    python-backoff
+
+[options.packages.find]
+exclude = tests
+
+[options.extras_require]
+dev =
+    coverage
+    flake8
+    mypy
+    pylint
+    pytest
+    python-dotenv
+    responses
+docs = sphinx
+
+[flake8]
+max-line-length = 120
+ignore = E203,W503
+
+[mypy]
+ignore_missing_imports = True
+check_untyped_defs = true
+local_partial_types = true

setup.cfg

@@ -1,49 +1,3 @@
-import re
-import sys
+from setuptools import setup
 
-from setuptools import find_packages, setup
-
-with open("README.md") as fh:
-    long_description = fh.read()
-
-VERSION = "devel"
-if sys.argv[1] == "--release-version":
-    sys.argv.pop(1)
-    VERSION = sys.argv.pop(1)
-    assert re.match(r"[0-9]+\.[0-9]+\.[0-9]+", VERSION), "Version definition required as first arg"
-
-requirements = ["requests", "backoff"]
-
-extra_requirements = {"dev": ["pytest", "coverage", "python-dotenv", "responses"], "docs": ["sphinx"]}
-
-setup(
-    name="3scale-api",
-    version=VERSION,
-    description="3scale API python client",
-    author="Peter Stanko",
-    author_email="stanko@mail.muni.cz",
-    maintainer="Matej Dujava",
-    maintainer_email="mdujava@redhat.com",
-    url="https://github.com/3scale-qe/3scale-api-python",
-    packages=find_packages(exclude=("tests",)),
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    include_package_data=True,
-    install_requires=requirements,
-    extras_require=extra_requirements,
-    entry_points={},
-    classifiers=[
-        "Operating System :: OS Independent",
-        "License :: OSI Approved :: Apache Software License",
-        "Intended Audience :: Developers",
-        "Topic :: Utilities",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-    ],
-)
+setup()

setup.py

@@ -209,10 +209,27 @@ def signup(self, params: dict, **kwargs) -> "Account":
         Returns(Account): Account instance
         """
         log.info("[SIGNUP] Create new Signup: params=%s, kwargs=%s", params, kwargs)
-        url = self.threescale_client.admin_api_url + "/signup"
+        url = self.threescale_client.admin_api_url + '/signup'
         response = self.rest.post(url=url, json=params, **kwargs)
         instance = self._create_instance(response=response)
         return instance
+        #url = self.threescale_client.admin_api_url + '/signup'
+        #try:
+        #    response = self.rest.post(url=url, json=params, **kwargs)
+        #    instance = self._create_instance(response=response)
+        #    return instance
+        #except errors.ApiClientError as err:
+        #    # Handle case where signup returned 500 but account was actually created
+        #    # (subsequent retries would fail with 422 "already been taken")
+        #    if err.code == 422 and b"already been taken" in err.body:
+        #        email = params.get("email")
+        #        if email:
+        #            log.info("[SIGNUP] Got 422 'already taken', attempting to find account by email: %s", email)
+        #            try:
+        #                return self.find(params={"email": email}, **kwargs)
+        #            except errors.ApiClientError:
+        #                pass  # Find failed, re-raise original error
+        #    raise
 
     def set_plan(self, entity_id: int, plan_id: int, **kwargs):
         """Sets account plan for the account

threescale_api/resources.py

@@ -69,7 +69,7 @@ def close(self):
         self.session.close()
 
     @staticmethod
-    def retry_for_session(session: requests.Session, status_forcelist: Iterable, total: int = 8):
+    def retry_for_session(session: requests.Session, status_forcelist: Iterable, total: int = 12):
         retry = Retry(
             total=total,
             backoff_factor=1,