From e64573cad9bb5d56678d847b3f25b2299b341bda Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 5 Dec 2023 15:58:03 +0100 Subject: [PATCH 1/4] Use compatible release clause in deps definition --- CHANGELOG.md | 4 +++- pyproject.toml | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c7770c..f06ad18e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## [1.4.1](../../releases/tag/v1.4.1) - Unreleased -... +### Internal changes + +- Use compatible release clause in dependencies definition ## [1.4.0](../../releases/tag/v1.4.0) - 2023-12-05 diff --git a/pyproject.toml b/pyproject.toml index 08e77bea..7b28bb0c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,18 +22,18 @@ classifiers = [ requires-python = ">=3.8" dependencies = [ - "aiofiles >= 22.1.0", - "aioshutil >= 1.0", + "aiofiles ~= 23.2.1", + "aioshutil ~= 1.3", "apify-client ~= 1.6.0", "apify-shared ~= 1.1.0", - "colorama >= 0.4.6", - "cryptography >= 39.0.0", - "httpx >= 0.24.1", - "psutil >= 5.9.5", - "pyee >= 11.0.1", - "sortedcollections >= 2.0.1", - "typing-extensions >= 4.1.0", - "websockets >= 10.1", + "colorama ~= 0.4.6", + "cryptography ~= 41.0.7", + "httpx ~= 0.25.2", + "psutil ~= 5.9.6", + "pyee ~= 11.1.0", + "sortedcollections ~= 2.1.0", + "typing-extensions ~= 4.6.3", + "websockets ~= 12.0", ] [project.optional-dependencies] @@ -52,8 +52,8 @@ dev = [ "ruff ~= 0.1.6", "twine ~= 4.0.2", "types-aiofiles ~= 23.2.0.0", - "types-colorama ~= 0.4.15.11", - "types-psutil ~= 5.9.5.12", + "types-colorama ~= 0.4.15.12", + "types-psutil ~= 5.9.5.17", ] scrapy = [ "scrapy ~= 2.11.0", From 96d19342e4be2b07c0f5b25b2e8222280b88832d Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 5 Dec 2023 16:34:51 +0100 Subject: [PATCH 2/4] Revert changes and add comment --- pyproject.toml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7b28bb0c..c2731a27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,19 +21,23 @@ classifiers = [ ] requires-python = ">=3.8" + +# We use inclusive ordered comparison clause for non-Apify packages intentionally in order to enhance the Apify SDK's +# compatibility with a wide range of external packages. This decision was discussed in detail in the following PR: +# https://github.com/apify/apify-sdk-python/pull/154 dependencies = [ - "aiofiles ~= 23.2.1", - "aioshutil ~= 1.3", "apify-client ~= 1.6.0", "apify-shared ~= 1.1.0", - "colorama ~= 0.4.6", - "cryptography ~= 41.0.7", - "httpx ~= 0.25.2", - "psutil ~= 5.9.6", - "pyee ~= 11.1.0", - "sortedcollections ~= 2.1.0", - "typing-extensions ~= 4.6.3", - "websockets ~= 12.0", + "aiofiles >= 22.1.0", + "aioshutil >= 1.0", + "colorama >= 0.4.6", + "cryptography >= 39.0.0", + "httpx >= 0.24.1", + "psutil >= 5.9.5", + "pyee >= 11.0.1", + "sortedcollections >= 2.0.1", + "typing-extensions >= 4.1.0", + "websockets >= 10.1", ] [project.optional-dependencies] From 8a66f2d4586c4d7952e10b345c8cb31ca5db6616 Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 5 Dec 2023 16:37:33 +0100 Subject: [PATCH 3/4] revert changelog --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f06ad18e..22c7770c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,7 @@ ## [1.4.1](../../releases/tag/v1.4.1) - Unreleased -### Internal changes - -- Use compatible release clause in dependencies definition +... ## [1.4.0](../../releases/tag/v1.4.0) - 2023-12-05 From 6227ba8119b36f27135797dbabe7c6add792cd56 Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Wed, 6 Dec 2023 09:52:19 +0100 Subject: [PATCH 4/4] uses >= for scrapy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c2731a27..5e3b6edc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dev = [ "types-psutil ~= 5.9.5.17", ] scrapy = [ - "scrapy ~= 2.11.0", + "scrapy >= 2.11.0", ] [project.urls]