Skip to content

Commit 52e0ce5

Browse files
committed
move ethpm deprecation warning to only show when enabled
1 parent 60cfce3 commit 52e0ce5

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

ethpm/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
import warnings
21
from pathlib import Path
32

43

5-
warnings.warn(
6-
"The ``ethPM`` module is no longer being maintained and will be "
7-
"deprecated with ``web3.py`` version 7",
8-
UserWarning,
9-
)
10-
114
ETHPM_DIR = Path(__file__).parent
125
ASSETS_DIR = ETHPM_DIR / "assets"
136

newsfragments/2930.internal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
`lint-roll` - dropped `isort` `--recursive` flag, not needed as of their `v5`, added black
1+
``lint-roll`` - dropped ``isort`` ``--recursive`` flag, not needed as of their ``v5``, added black

newsfragments/2960.docs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Completed docstrings for `ContractFunction` and `AsyncContractFunction` classes
1+
Completed docstrings for ``ContractFunction`` and ``AsyncContractFunction`` classes

newsfragments/2961.docs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Added 'unsupported by any current clients' note to the `Eth.sign_typed_data` docs
1+
Added 'unsupported by any current clients' note to the ``Eth.sign_typed_data`` docs

newsfragments/2962.docs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Removed list of `AsyncHTTPProvider`-supported methods, it supports them all now
1+
Removed list of ``AsyncHTTPProvider``-supported methods, it supports them all now

newsfragments/2971.docs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Removed references to defunct providers in `IPCProvider` docs
1+
Removed references to defunct providers in ``IPCProvider`` docs

newsfragments/2983.internal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Moved ``ethpm`` deprecation warning to only show when the module is explicitly enabled

web3/main.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import decimal
2+
import warnings
23

34
from ens import (
45
AsyncENS,
@@ -343,9 +344,14 @@ def pm(self) -> "PM":
343344
)
344345

345346
def enable_unstable_package_management_api(self) -> None:
346-
from web3.pm import PM # noqa: F811
347-
348347
if not hasattr(self, "_pm"):
348+
warnings.warn(
349+
"The ``ethPM`` module is no longer being maintained and will be "
350+
"deprecated with ``web3.py`` version 7",
351+
UserWarning,
352+
)
353+
from web3.pm import PM # noqa: F811
354+
349355
self.attach_modules({"_pm": PM})
350356

351357

0 commit comments

Comments
 (0)