From 520d577e3fcab3debd6f2b53656235f084c0e573 Mon Sep 17 00:00:00 2001 From: Andrei Date: Thu, 14 Dec 2023 02:37:45 +0300 Subject: [PATCH 01/34] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ccb682e..4a18e42f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,6 +49,6 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - files: /home/runner/work/python3-capsolver/python3-capsolver/src/coverage/coverage.xml + files: ${{github.workspace}}/src/coverage/coverage.xml fail_ci_if_error: true verbose: true From 881b15ccd1ec992ebd2a4d5abbb3cd0270133647 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:52:08 +0000 Subject: [PATCH 02/34] Bump black from 23.10.1 to 23.12.0 Bumps [black](https://github.com/psf/black) from 23.10.1 to 23.12.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.10.1...23.12.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index c6f5d3fb..df939544 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==23.10.1 +black==23.12.0 autoflake==2.* From 2bd1bd0c29db1944b1c50078c0157684759f2e06 Mon Sep 17 00:00:00 2001 From: Andrei Date: Mon, 25 Dec 2023 02:40:53 +0300 Subject: [PATCH 03/34] rename allow_population_by_field_name --- src/python3_capsolver/core/serializer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python3_capsolver/core/serializer.py b/src/python3_capsolver/core/serializer.py index 29314895..bb8fca16 100644 --- a/src/python3_capsolver/core/serializer.py +++ b/src/python3_capsolver/core/serializer.py @@ -45,7 +45,7 @@ class CaptchaResponseSer(ResponseSer): solution: Dict[str, Any] = Field(None, description="Task result data. Different for each type of task.") class Config: - allow_population_by_field_name = True + populate_by_name = True class ControlResponseSer(ResponseSer): From 46913d5a01b9657693c76c1d722f0b417ae766be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 21:46:29 +0000 Subject: [PATCH 04/34] Bump black from 23.12.0 to 23.12.1 Bumps [black](https://github.com/psf/black) from 23.12.0 to 23.12.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.12.0...23.12.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index df939544..75e9b104 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==23.12.0 +black==23.12.1 autoflake==2.* From b9aec55a24e695a235d064a0625a3815eaf8c5a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 21:03:53 +0000 Subject: [PATCH 05/34] Bump black from 23.12.1 to 24.1.1 Bumps [black](https://github.com/psf/black) from 23.12.1 to 24.1.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.12.1...24.1.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index 75e9b104..8855687b 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==23.12.1 +black==24.1.1 autoflake==2.* From 56ca83fcc4e14d4ca26880997056811b71242ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 21:04:01 +0000 Subject: [PATCH 06/34] Update pytest requirement from ==7.* to ==8.* Updates the requirements on [pytest](https://github.com/pytest-dev/pytest) to permit the latest version. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.0.0rc1...8.0.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.test.txt b/requirements.test.txt index 7ca81d83..93fd10c3 100644 --- a/requirements.test.txt +++ b/requirements.test.txt @@ -1,3 +1,3 @@ -pytest==7.* +pytest==8.* coverage==7.* pytest-asyncio==0.* From ae6edfb99f348a68ac5b7797cf7fd399d9286d1b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 31 Jan 2024 06:57:42 +0000 Subject: [PATCH 07/34] fix: src/requirements.txt to reduce vulnerabilities The following vulnerabilities are fixed by pinning transitive dependencies: - https://snyk.io/vuln/SNYK-PYTHON-AIOHTTP-6209406 - https://snyk.io/vuln/SNYK-PYTHON-AIOHTTP-6209407 --- src/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.txt b/src/requirements.txt index 7b5e5852..fa9aebc5 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 -aiohttp>=3.7.4 +aiohttp>=3.9.2 pydantic==2.4.2 tenacity==8.* From d09e1cf92eec2720f633dab3cb7b74e474f1528c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 21:34:39 +0000 Subject: [PATCH 08/34] [github-actions] Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4a18e42f..935ed3e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: run: make tests - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} files: ${{github.workspace}}/src/coverage/coverage.xml From a8d9582f2a5c1a28be88c96ffd4f80a50b88485b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 21:27:27 +0000 Subject: [PATCH 09/34] Bump pydantic from 2.4.2 to 2.6.1 Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.4.2 to 2.6.1. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.4.2...v2.6.1) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 0a305ba3..24a71b5e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,5 +2,5 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.0.1 -pydantic==2.4.2 +pydantic==2.6.1 pydantic-settings==2.0.3 diff --git a/src/requirements.txt b/src/requirements.txt index fa9aebc5..cd48777a 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 aiohttp>=3.9.2 -pydantic==2.4.2 +pydantic==2.6.1 tenacity==8.* From b46e727cf90eb287b5572c0f84b72a5b4be02b25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 21:20:15 +0000 Subject: [PATCH 10/34] Bump black from 24.1.1 to 24.2.0 Bumps [black](https://github.com/psf/black) from 24.1.1 to 24.2.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.1.1...24.2.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index 8855687b..633fb722 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==24.1.1 +black==24.2.0 autoflake==2.* From 5da69bd77b6a6a853c3b0b4902808a90e7baa729 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:20:31 +0000 Subject: [PATCH 11/34] Bump pydantic-settings from 2.0.3 to 2.2.1 Bumps [pydantic-settings](https://github.com/pydantic/pydantic-settings) from 2.0.3 to 2.2.1. - [Release notes](https://github.com/pydantic/pydantic-settings/releases) - [Commits](https://github.com/pydantic/pydantic-settings/compare/v2.0.3...v2.2.1) --- updated-dependencies: - dependency-name: pydantic-settings dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 24a71b5e..8a4ac69d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,4 +3,4 @@ pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.0.1 pydantic==2.6.1 -pydantic-settings==2.0.3 +pydantic-settings==2.2.1 From 9c93b7d0b0539f56489b61e801c286066f96812b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 21:52:04 +0000 Subject: [PATCH 12/34] Bump pydantic from 2.6.1 to 2.6.2 Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.6.1...v2.6.2) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8a4ac69d..70d9deaf 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,5 +2,5 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.0.1 -pydantic==2.6.1 +pydantic==2.6.2 pydantic-settings==2.2.1 diff --git a/src/requirements.txt b/src/requirements.txt index cd48777a..0fa1df22 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 aiohttp>=3.9.2 -pydantic==2.6.1 +pydantic==2.6.2 tenacity==8.* From a36527748de907ba5b5bf365b061afd0e999bf0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:30:04 +0000 Subject: [PATCH 13/34] Bump pydantic from 2.6.2 to 2.6.3 Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.6.2 to 2.6.3. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.6.2...v2.6.3) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 70d9deaf..df16ca36 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,5 +2,5 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.0.1 -pydantic==2.6.2 +pydantic==2.6.3 pydantic-settings==2.2.1 diff --git a/src/requirements.txt b/src/requirements.txt index 0fa1df22..ebb815ee 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 aiohttp>=3.9.2 -pydantic==2.6.2 +pydantic==2.6.3 tenacity==8.* From fcdd289eb4e79b277c5256dbb45d06545c47e5a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:50:49 +0000 Subject: [PATCH 14/34] Bump pydantic from 2.6.3 to 2.6.4 Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index df16ca36..aea405d2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,5 +2,5 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.0.1 -pydantic==2.6.3 +pydantic==2.6.4 pydantic-settings==2.2.1 diff --git a/src/requirements.txt b/src/requirements.txt index ebb815ee..e2e328e3 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 aiohttp>=3.9.2 -pydantic==2.6.3 +pydantic==2.6.4 tenacity==8.* From 6a1ca2f1f9c40f154d1eda25865c39500c33ecd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:51:05 +0000 Subject: [PATCH 15/34] Bump black from 24.2.0 to 24.3.0 Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.2.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index 633fb722..5f259ed3 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==24.2.0 +black==24.3.0 autoflake==2.* From 3550e5f35b5d6e96f1e904e22d70edc783c471b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:27:43 +0000 Subject: [PATCH 16/34] Bump autodoc-pydantic from 2.0.1 to 2.1.0 Bumps [autodoc-pydantic](https://github.com/mansenfranzen/autodoc_pydantic) from 2.0.1 to 2.1.0. - [Changelog](https://github.com/mansenfranzen/autodoc_pydantic/blob/main/CHANGELOG.md) - [Commits](https://github.com/mansenfranzen/autodoc_pydantic/compare/v2.0.1...v2.1.0) --- updated-dependencies: - dependency-name: autodoc-pydantic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index aea405d2..095acf6d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 -autodoc_pydantic==2.0.1 +autodoc_pydantic==2.1.0 pydantic==2.6.4 pydantic-settings==2.2.1 From 337dbd3ee7b60252aea8bcf0c09fb5708c6c863b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:00:52 +0000 Subject: [PATCH 17/34] [github-actions] Bump peaceiris/actions-gh-pages from 3 to 4 Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4. - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4) --- updated-dependencies: - dependency-name: peaceiris/actions-gh-pages dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/sphinx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 5c6516a9..a7d41d19 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -27,7 +27,7 @@ jobs: run: make doc - name: Deploy - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: publish_branch: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} From dea46748ecddf453426069b9eb8f5b84f7d9a4f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 21:54:15 +0000 Subject: [PATCH 18/34] Bump black from 24.3.0 to 24.4.0 Bumps [black](https://github.com/psf/black) from 24.3.0 to 24.4.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.3.0...24.4.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.style.txt b/requirements.style.txt index 5f259ed3..8bb21fad 100644 --- a/requirements.style.txt +++ b/requirements.style.txt @@ -1,4 +1,4 @@ # codestyle isort==5.* -black==24.3.0 +black==24.4.0 autoflake==2.* From 3e078a8dbf1fd42e6177109d2d09b2027a4d9ea0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 21:54:20 +0000 Subject: [PATCH 19/34] Bump pydantic from 2.6.4 to 2.7.0 Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.6.4 to 2.7.0. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.6.4...v2.7.0) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 095acf6d..47821447 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,5 +2,5 @@ sphinx==7.2.6 pallets_sphinx_themes==2.1.1 myst-parser==2.0.0 autodoc_pydantic==2.1.0 -pydantic==2.6.4 +pydantic==2.7.0 pydantic-settings==2.2.1 diff --git a/src/requirements.txt b/src/requirements.txt index e2e328e3..1795a056 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ requests>=2.21.0 aiohttp>=3.9.2 -pydantic==2.6.4 +pydantic==2.7.0 tenacity==8.* From 9257d1d3c1c65169656a74c515bf5318f780c62c Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 16:15:20 +0300 Subject: [PATCH 20/34] Create .python-version --- .python-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .python-version diff --git a/.python-version b/.python-version new file mode 100644 index 00000000..871f80a3 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.12.3 From e931e2dc4d63403726b6fae02ee904da563432cd Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 16:19:05 +0300 Subject: [PATCH 21/34] Update serializer.py --- src/python3_capsolver/core/serializer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/python3_capsolver/core/serializer.py b/src/python3_capsolver/core/serializer.py index bb8fca16..5af2f8d2 100644 --- a/src/python3_capsolver/core/serializer.py +++ b/src/python3_capsolver/core/serializer.py @@ -120,8 +120,7 @@ class DatadomeSliderSer(TaskSer): userAgent: str = Field(..., description="Browser's User-Agent which is used in emulation") -class CloudflareTurnstileSer(WebsiteDataOptionsSer): - ... +class CloudflareTurnstileSer(WebsiteDataOptionsSer): ... class CyberSiAraSer(WebsiteDataOptionsSer): From 385a399a857af7e7a765ce2fcf7a55aba28bdbd9 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 16:21:53 +0300 Subject: [PATCH 22/34] 0.9.3 --- src/python3_capsolver/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python3_capsolver/__version__.py b/src/python3_capsolver/__version__.py index a2fecb45..c5981731 100644 --- a/src/python3_capsolver/__version__.py +++ b/src/python3_capsolver/__version__.py @@ -1 +1 @@ -__version__ = "0.9.2" +__version__ = "0.9.3" From 20e554fbc531593571035fd2d8b768da4fb5026b Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 16:24:47 +0300 Subject: [PATCH 23/34] added Python :: 3.12 --- src/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup.py b/src/setup.py index ea93669b..91674eb1 100644 --- a/src/setup.py +++ b/src/setup.py @@ -129,6 +129,7 @@ def run(self): "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", From 147bb234ac716dae55f320b0e16ddbe5602cad00 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 16:25:50 +0300 Subject: [PATCH 24/34] updated workflows for "3.12" --- .github/workflows/build.yml | 2 +- .github/workflows/install.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13217111..686cd775 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 3c681b69..f664832a 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 65db0f76..1e39c9f9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 From a7614c365561a21e22fe1b01e9805c771c85953a Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:22 +0300 Subject: [PATCH 25/34] Update build.yml --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 686cd775..ae6472c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 4560b7af454d06d596b6714970c86d7d0bdd69c6 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:24 +0300 Subject: [PATCH 26/34] Update install.yml --- .github/workflows/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index f664832a..20574950 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -33,4 +33,4 @@ jobs: run: make install - name: PYPI install checking - run: pip install python3-capsolver + run: pip3 install python3-capsolver From 6f1c28b223a4afc4ba772d98d2f4690e7c9285d0 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:28 +0300 Subject: [PATCH 27/34] Update lint.yml --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1e39c9f9..4a920caf 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,8 +35,8 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip - pip install -r requirements.style.txt + pip3 install --upgrade pip + pip3 install -r requirements.style.txt - name: Lint run: make lint From 6e82a591f7b220b26f13c895522380ff4ac62c4c Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:31 +0300 Subject: [PATCH 28/34] Update Makefile --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 54c311a1..321651c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ install: - cd src/ && pip install -e . + pip3 install -e . remove: pip uninstall python3_capsolver -y @@ -22,9 +22,13 @@ lint: black src/ --check isort src/ --check-only +build: + pip3 install --upgrade build + python3 -m build + upload: - pip install twine wheel - cd src/ && python setup.py upload + pip3 install twine wheel build + twine upload dist/* tests: install coverage run --rcfile=.coveragerc -m pytest -vv --showlocals --pastebin=all \ From 76b2c25b3aac2cf97742a7d82cd604a925da943d Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:35 +0300 Subject: [PATCH 29/34] Update pyproject.toml --- pyproject.toml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 7e5ef0b1..396b785a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,3 +28,77 @@ testpaths = [ "tests", ] addopts = "-vv --tb=short --durations=10" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "python3-capsolver" +dynamic = ["version"] +authors = [ + {name = "AndreiDrang", email = "python-captcha@pm.me"}, +] +description = "Python 3.8+ Capsolver library with AIO module." +readme = "README.md" +requires-python = ">=3.8" +keywords = [ "captcha", + "recaptcha", + "geetest", + "hcaptcha", + "capypuzzle", + "rotatecaptcha", + "funcaptcha", + "keycaptcha", + "python3", + "python-library", + "capsolver", + "datadomeslider", + "datadome", + "mtcaptcha", + "turnstile", + "cloudflare", + "amazon", + "amazon_waf", + "akamai", + "imperva", + "binance" + ] +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.8", + "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", + "pydantic==2.7.0", + "tenacity==8.*" +] + +[tool.setuptools.packages.find] +where = ["src"] +include = ["python3_capsolver*"] + +[tool.setuptools.dynamic] +version = {attr = "python3_capsolver.__version__"} + +[project.urls] +Homepage = "https://andreidrang.github.io/python3-capsolver/" +Documentation = "https://andreidrang.github.io/python3-capsolver/" +Repository = "https://github.com/AndreiDrang/python3-capsolver" +Issues = "https://github.com/AndreiDrang/python3-capsolver/issues" +Changelog = "https://github.com/AndreiDrang/python3-capsolver/releases" From 674e9c4817aae65056badacf8f72a9e6feb7b174 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:37 +0300 Subject: [PATCH 30/34] Delete requirements.txt --- src/requirements.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/requirements.txt diff --git a/src/requirements.txt b/src/requirements.txt deleted file mode 100644 index 1795a056..00000000 --- a/src/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -requests>=2.21.0 -aiohttp>=3.9.2 -pydantic==2.7.0 -tenacity==8.* From c9b8f27c84409401af7c9a54869f8eeeff6f37a0 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:34:41 +0300 Subject: [PATCH 31/34] Delete setup.py --- src/setup.py | 142 --------------------------------------------------- 1 file changed, 142 deletions(-) delete mode 100644 src/setup.py diff --git a/src/setup.py b/src/setup.py deleted file mode 100644 index 91674eb1..00000000 --- a/src/setup.py +++ /dev/null @@ -1,142 +0,0 @@ -import io -import os -import sys -import shutil -import logging - -from setuptools import Command, setup -from pkg_resources import parse_requirements - -from python3_capsolver.__version__ import __version__ - -# Package meta-data. -NAME = "python3-capsolver" -DESCRIPTION = "Python 3.8+ Capsolver library with AIO module." -URL = "https://andreidrang.github.io/python3-capsolver/" -EMAIL = "python-captcha@pm.me" -AUTHOR = "AndreiDrang" -REQUIRES_PYTHON = ">=3.8.0" -VERSION = __version__ -with open("requirements.txt", "rt") as requirements_txt: - REQUIRED = [str(requirement) for requirement in parse_requirements(requirements_txt)] - - -here = os.path.abspath(os.path.dirname(__file__)) - -# Import the README and use it as the long-description. -# Note: this will only work if 'README.md' is present in your MANIFEST.in file! -try: - with io.open(os.path.join(here, "../README.md"), encoding="utf-8") as f: - long_description = "\n" + f.read() -except FileNotFoundError: - long_description = DESCRIPTION - - -class UploadCommand(Command): - """Support setup.py upload.""" - - description = "Build and publish the package." - user_options = [] - - @staticmethod - def status(s): - """Prints things in bold.""" - print("\033[1m{0}\033[0m".format(s)) - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - logging.info("Prepapre wheel") - os.system("pip install wheel") - - logging.info("Building Source and Wheel distribution . . .") - os.system("python setup.py sdist bdist_wheel") - - logging.info("Uploading the package to PyPI via Twin . . .") - os.system("twine upload dist/* --verbose") - - logging.info("🤖 Uploaded . . .") - - logging.info("Clean dist . . .") - shutil.rmtree("dist/", ignore_errors=True) - - logging.info("Clean build . . .") - shutil.rmtree("build/", ignore_errors=True) - - logging.info("Clean python_rucaptcha.egg-info . . .") - shutil.rmtree("python3_capsolver.egg-info/", ignore_errors=True) - sys.exit() - - -setup( - name=NAME, - version=VERSION, - author=AUTHOR, - packages=["python3_capsolver", "python3_capsolver.core"], - install_requires=REQUIRED, - description=DESCRIPTION, - long_description=long_description, - long_description_content_type="text/markdown", - author_email=EMAIL, - project_urls={ - "Documentation": URL, - "Source": "https://github.com/AndreiDrang/python3-capsolver", - }, - package_dir={"python3-capsolver": "python3_capsolver"}, - include_package_data=True, - py_modules=["python3_capsolver"], - url=URL, - license="MIT", - keywords=""" - captcha - recaptcha - geetest - hcaptcha - capypuzzle - rotatecaptcha - funcaptcha - keycaptcha - python3 - python-library - capsolver - datadomeslider - datadome - mtcaptcha - turnstile - cloudflare - amazon - amazon_waf - akamai - imperva - binance - """, - python_requires=REQUIRES_PYTHON, - zip_safe=False, - classifiers=[ - # Trove classifiers - # Full list: https://pypi.python.org/pypi?%3Aaction=list_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.8", - "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", - ], - # Build - `python setup.py bdist_wheel` - # Upload package: `python3 setup.py upload` - cmdclass={"upload": UploadCommand}, -) -print("🤖 Success install ...") From 44490fdbbddebb424d03f678e3bcb29a0bab210d Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:35:10 +0300 Subject: [PATCH 32/34] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 321651c6..0b372aa8 100644 --- a/Makefile +++ b/Makefile @@ -23,11 +23,11 @@ lint: isort src/ --check-only build: - pip3 install --upgrade build + pip3 install --upgrade build setuptools python3 -m build upload: - pip3 install twine wheel build + pip3 install twine wheel setuptools build twine upload dist/* tests: install From 79577c025b9e7d11683641ad0f8295cb003457e8 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:38:14 +0300 Subject: [PATCH 33/34] Update __init__.py --- src/python3_capsolver/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python3_capsolver/__init__.py b/src/python3_capsolver/__init__.py index e69de29b..b6b45ac3 100644 --- a/src/python3_capsolver/__init__.py +++ b/src/python3_capsolver/__init__.py @@ -0,0 +1 @@ +from python3_capsolver.__version__ import __version__ # noqa From efc65c9b4f7224d778e6a518aeb726daac55cc71 Mon Sep 17 00:00:00 2001 From: Andrei Date: Tue, 16 Apr 2024 17:41:13 +0300 Subject: [PATCH 34/34] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 935ed3e7..8710ca82 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,9 +38,9 @@ jobs: - name: Install dependencies run: | - pip install --upgrade pip + pip install --upgrade pip build setuptools pip install -r requirements.test.txt - pip install -r src/requirements.txt + pip install . - name: Test run: make tests