From 8d1fcea237fd103e149720d69abd6fceac08dc7a Mon Sep 17 00:00:00 2001 From: kclowes Date: Wed, 14 Sep 2022 14:47:34 -0600 Subject: [PATCH 1/5] Remove dependency upper limits --- setup.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 9574f74ffc..3b3b8cac74 100644 --- a/setup.py +++ b/setup.py @@ -10,12 +10,12 @@ "py-geth>=3.10.0,<4", ], "linter": [ - "black>=22.1.0,<23.0", + "black>=22.1.0", "flake8==3.8.3", "isort>=4.2.15,<4.3.5", "mypy==0.910", - "types-setuptools>=57.4.4,<58", - "types-requests>=2.26.1,<3", + "types-setuptools>=57.4.4", + "types-requests>=2.26.1", "types-protobuf==3.19.13", ], "docs": [ @@ -23,10 +23,10 @@ "click>=5.1", "configparser==3.5.0", "contextlib2>=0.5.4", - "py-geth>=3.9.1,<4", + "py-geth>=3.9.1", "py-solc>=0.4.0", - "pytest>=6.2.5,<7", - "sphinx>=4.2.0,<5", + "pytest>=6.2.5", + "sphinx>=4.2.0", "sphinx_rtd_theme>=0.5.2", "toposort>=1.4", "towncrier==18.5.0", @@ -75,22 +75,22 @@ url="https://github.com/ethereum/web3.py", include_package_data=True, install_requires=[ - "aiohttp>=3.7.4.post0,<4", - "eth-abi>=3.0.0,<4.0.0", - "eth-account>=0.7.0,<0.8.0", - "eth-hash[pycryptodome]>=0.2.0,<1.0.0", - "eth-typing>=3.0.0,<4.0.0", - "eth-utils>=2.0.0,<3.0.0", - "hexbytes>=0.1.0,<1.0.0", + "aiohttp>=3.7.4.post0", + "eth-abi>=3.0.0", + "eth-account>=0.7.0", + "eth-hash[pycryptodome]>=0.2.0", + "eth-typing>=3.0.0", + "eth-utils>=2.0.0", + "hexbytes>=0.1.0", "ipfshttpclient==0.8.0a2", - "jsonschema>=4.0.0,<5", - "lru-dict>=1.1.6,<2.0.0", + "jsonschema>=4.0.0", + "lru-dict>=1.1.6", "protobuf>=4.21.6", "pywin32>=223;platform_system=='Windows'", - "requests>=2.16.0,<3.0.0", + "requests>=2.16.0", # remove typing_extensions after python_requires>=3.8, see web3._utils.compat "typing-extensions>=3.7.4.1,<5;python_version<'3.8'", - "websockets>=10.0.0,<11", + "websockets>=10.0.0", ], python_requires=">=3.7.2", extras_require=extras_require, From 8d04bb68d139befb9f7a58aa73ff49b17f0dab69 Mon Sep 17 00:00:00 2001 From: kclowes Date: Wed, 26 Oct 2022 15:32:06 -0600 Subject: [PATCH 2/5] Add newsfragment --- newsfragments/2648.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2648.feature.rst diff --git a/newsfragments/2648.feature.rst b/newsfragments/2648.feature.rst new file mode 100644 index 0000000000..31142b4030 --- /dev/null +++ b/newsfragments/2648.feature.rst @@ -0,0 +1 @@ +Remove upper pins on dependencies From 25b543860614c4c507d4829604c791d353b606a8 Mon Sep 17 00:00:00 2001 From: kclowes Date: Wed, 26 Oct 2022 15:34:08 -0600 Subject: [PATCH 3/5] Doc test fix --- docs/web3.net.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/web3.net.rst b/docs/web3.net.rst index 73448c0397..bc5433725e 100644 --- a/docs/web3.net.rst +++ b/docs/web3.net.rst @@ -13,7 +13,7 @@ Properties The following properties are available on the ``web3.net`` namespace. .. py:method:: listening - :property: + ..py:property:: * Delegates to ``net_listening`` RPC method @@ -25,7 +25,7 @@ The following properties are available on the ``web3.net`` namespace. True .. py:method:: peer_count - :property: + ..py:property:: * Delegates to ``net_peerCount`` RPC method @@ -37,7 +37,7 @@ The following properties are available on the ``web3.net`` namespace. 1 .. py:method:: version - :property: + ..py:property:: * Delegates to ``net_version`` RPC Method From 64f6ac10029a65a57cb9adf56f50510387650e8a Mon Sep 17 00:00:00 2001 From: kclowes Date: Thu, 27 Oct 2022 14:22:11 -0600 Subject: [PATCH 4/5] Remove pins on dev dependencies --- setup.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 3b3b8cac74..ca3b8fc393 100644 --- a/setup.py +++ b/setup.py @@ -35,21 +35,21 @@ ], "dev": [ "bumpversion", - "flaky>=3.7.0,<4", - "hypothesis>=3.31.2,<6", + "flaky>=3.7.0", + "hypothesis>=3.31.2", "importlib-metadata<5.0;python_version<'3.8'", - "pytest>=6.2.5,<7", - "pytest-asyncio>=0.18.1,<0.19", - "pytest-mock>=1.10,<2", + "pytest>=6.2.5", + "pytest-asyncio>=0.18.1", + "pytest-mock>=1.10", "pytest-pythonpath>=0.3", - "pytest-watch>=4.2,<5", - "pytest-xdist>=1.29,<2", + "pytest-watch>=4.2", + "pytest-xdist>=1.29", "setuptools>=38.6.0", "tox>=1.8.0", - "tqdm>4.32,<5", - "twine>=1.13,<2", + "tqdm>4.32", + "twine>=1.13", "pluggy==0.13.1", - "when-changed>=0.3.0,<0.4", + "when-changed>=0.3.0", ], } From 51b0bf619b00dd76c6e9111ad0e4e59c7db06e37 Mon Sep 17 00:00:00 2001 From: kclowes Date: Thu, 27 Oct 2022 14:30:44 -0600 Subject: [PATCH 5/5] Remove pin for py-geth --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ca3b8fc393..21e0f1c9d5 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ extras_require = { "tester": [ "eth-tester[py-evm]==v0.7.0-beta.1", - "py-geth>=3.10.0,<4", + "py-geth>=3.10.0", ], "linter": [ "black>=22.1.0",