upd

.github/workflows/test_build.yml → .github/workflows/build.yml

@@ -4,13 +4,13 @@ on:
   push:
     branches: [ "main", "release"]
     paths:
-      - '.github/workflows/test_build.yml'
+      - '.github/workflows/build.yml'
       - 'src/**'
       - 'Makefile'
   pull_request:
     branches: [ "main", "release"]
     paths:
-      - '.github/workflows/test_build.yml'
+      - '.github/workflows/build.yml'
       - 'src/**'
       - 'Makefile'
 
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
@@ -30,6 +30,4 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Local build checking
-      run: |
-        pip install twine wheel
-        cd src/ && python setup.py sdist bdist_wheel
+      run: make build

Makefile

@@ -1,5 +1,8 @@
 install:
-	cd src/ && pip install -e .
+	pip3 install -e .
+
+remove:
+	pip3 uninstall python3_anticaptcha -y
 
 tests: install
 	coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --pastebin=all tests --disable-warnings && \
@@ -26,9 +29,13 @@ lint:
 	black src/ --check && \
 	isort src/ --check-only
 
+build:
+	pip3 install --upgrade build setuptools
+	python3 -m build
+
 upload:
-	pip install twine
-	cd src/ && python setup.py upload
+	pip3 install twine wheel setuptools build
+	twine upload dist/*
 
 doc: install
 	cd docs/ && \

README.md

@@ -2,9 +2,9 @@
 
 ![Logo](https://red-panda-dev.xyz/media/images/AntiCaptcha_MCSmjTi.original.png)
 
-### [Capsolver](https://capsolver.com?utm_source=github&utm_medium=banner_github&utm_campaign=python3-anticaptcha)
+### [Capsolver](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python3-anticaptcha)
 
-[![Capsolver](files/capsolver.png)](https://capsolver.com?utm_source=github&utm_medium=banner_github&utm_campaign=python3-anticaptcha)
+[![Capsolver](files/capsolver.png)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python3-anticaptcha)
 
 <hr>
 
@@ -17,7 +17,7 @@
 [![codecov](https://codecov.io/gh/AndreiDrang/python3-anticaptcha/branch/main/graph/badge.svg?token=W92nfZY6Tz)](https://codecov.io/gh/AndreiDrang/python3-anticaptcha)
 
 [![Sphinx docs](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/sphinx.yml/badge.svg?branch=release)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/sphinx.yml)
-[![Build check](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test_build.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test_build.yml)
+[![Building](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/build.yml/badge.svg)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/build.yml)
 [![Installation check](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/install.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/install.yml)
 [![Test](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test.yml)
 [![Lint](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/lint.yml)

docs/modules/main/info.md

@@ -4,9 +4,9 @@
 
 ![](../../_static/AntiCaptcha.png)
 
-### [Capsolver](https://capsolver.com?utm_source=github&utm_medium=banner_github&utm_campaign=python3-anticaptcha)
+### [Capsolver](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python3-anticaptcha)
 
-[![Capsolver](../../_static/capsolver.png)](https://capsolver.com?utm_source=github&utm_medium=banner_github&utm_campaign=python3-anticaptcha)
+[![Capsolver](../../_static/capsolver.png)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python3-anticaptcha)
 
 <hr>
 
@@ -16,9 +16,9 @@
 
 [![Code Climate](https://codeclimate.com/github/AndreiDrang/python3-anticaptcha/badges/gpa.svg)](https://codeclimate.com/github/AndreiDrang/python3-anticaptcha)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/7f49780f2edb48d4b133833887c850e8)](https://www.codacy.com/gh/AndreiDrang/python3-anticaptcha/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=AndreiDrang/python3-anticaptcha&amp;utm_campaign=Badge_Grade)
-[![codecov](https://codecov.io/gh/AndreiDrang/python3-anticaptcha/branch/master/graph/badge.svg?token=W92nfZY6Tz)](https://codecov.io/gh/AndreiDrang/python3-anticaptcha)
+[![codecov](https://codecov.io/gh/AndreiDrang/python3-anticaptcha/branch/main/graph/badge.svg?token=W92nfZY6Tz)](https://codecov.io/gh/AndreiDrang/python3-anticaptcha)
 
-[![Build check](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test_build.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test_build.yml)
+[![Building](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/build.yml/badge.svg)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/build.yml)
 [![Installation check](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/install.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/install.yml)
 [![Test](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/test.yml)
 [![Lint](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-anticaptcha/actions/workflows/lint.yml)

pyproject.toml

@@ -27,3 +27,79 @@ testpaths = [
     "tests",
 ]
 addopts = "-vv --tb=short --durations=5"
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python3-anticaptcha"
+dynamic = ["version"]
+authors = [
+    {name = "AndreiDrang", email = "python-captcha@pm.me"},
+]
+description = "Python 3.9+ RuCaptcha library with AIO module."
+readme = "README.md"
+requires-python = ">=3.9"
+keywords = [    "captcha",
+				"anticaptcha",
+				"deathbycaptcha",
+				"recaptcha",
+				"geetest",
+				"hcaptcha",
+				"capypuzzle",
+				"rotatecaptcha",
+				"funcaptcha",
+				"keycaptcha",
+				"python3",
+				"recaptcha",
+				"captcha",
+				"security",
+				"tencent",
+				"atb_captcha",
+				"python-library",
+				"python-anticaptcha",
+				"anticaptcha-client",
+				"yandex",
+				"turnstile",
+				"amazon",
+				"amazon_waf",
+				"friendly-captcha"
+            ]
+license = {text = "MIT License"}
+classifiers = [
+        "License :: OSI Approved :: MIT License",
+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Framework :: AsyncIO",
+        "Operating System :: Unix",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: MacOS",
+]
+dependencies = [
+    "requests>=2.21.0",
+    "aiohttp>=3.9.2",
+    "msgspec==0.18.*",
+    "tenacity>=8,<10"
+]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+include = ["python3_anticaptcha*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "python3_anticaptcha.__version__"}
+
+[project.urls]
+Homepage = "https://andreidrang.github.io/python3-anticaptcha"
+Documentation = "https://andreidrang.github.io/python3-anticaptcha"
+Repository = "https://github.com/AndreiDrang/python3-anticaptcha"
+Issues = "https://github.com/AndreiDrang/python3-anticaptcha/issues"
+Changelog = "https://github.com/AndreiDrang/python3-anticaptcha/releases"

src/python3_anticaptcha/__init__.py

@@ -0,0 +1 @@
+from python3_anticaptcha.__version__ import __version__  # noqa

src/python3_anticaptcha/__version__.py

@@ -1 +1 @@
-__version__ = "2.0.1a"
+__version__ = "2.0.2a"