Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions py4DSTEM/__init__.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
from py4DSTEM.version import __version__
from emdfile import tqdmnd

# pyparsing >= 3.3 raises PyparsingDeprecationWarning -- a UserWarning
# subclass, so it is displayed by default -- whenever a dependency such as
# older matplotlib mathtext calls its camelCase compatibility API. This fires
# once per rendered label and floods plotting output with messages like
# "'parseString' deprecated - use 'parse_string'". There is nothing a py4DSTEM
# user can do about it, so silence that category here.
import warnings as _warnings

try:
from pyparsing import PyparsingDeprecationWarning as _PyparsingDeprecationWarning

_warnings.filterwarnings("ignore", category=_PyparsingDeprecationWarning)
except ImportError:
pass

from importlib.metadata import packages_distributions

is_package_lite = "py4DSTEM-lite" in packages_distributions()["py4DSTEM"]
Expand Down
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
"h5py >= 3.2.0",
"hdf5plugin >= 4.1.3",
"ncempy >= 1.8.1",
"matplotlib >= 3.2.2",
# matplotlib < 3.11 calls pyparsing's deprecated camelCase API from
# mathtext, which floods plotting output with deprecation warnings
# under pyparsing >= 3.3; require 3.11 wherever python allows it
"matplotlib >= 3.2.2; python_version < '3.11'",
"matplotlib >= 3.11; python_version >= '3.11'",
"scikit-image >= 0.17.2",
"scikit-learn >= 0.23.2",
"scikit-optimize >= 0.9.0",
Expand Down
Loading