Skip to content

Commit

Permalink
Replace pkg_resources with importlib.metadata.
Browse files Browse the repository at this point in the history
Modified from @DvdGiessen suggestion in #66
  • Loading branch information
BrianPugh committed Dec 4, 2023
1 parent 228f10d commit 796a8d8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
7 changes: 5 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
author = "Jürg Rast"

# The full version, including alpha/beta/rc tags
from pkg_resources import get_distribution
try:
from importlib_metadata import version as importlib_metadata_version
except ImportError:
from importlib.metadata import version as importlib_metadata_version

version = get_distribution("littlefs-python").version
version = importlib_metadata_version("littlefs-python")
release = version

# The master doc must be set for read the docs.
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
"littlefs-python = littlefs.__main__:main",
]
},
install_requires=[
"importlib-metadata>=4.4; python_version < '3.10'",
],
classifiers=[
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
Expand Down
10 changes: 7 additions & 3 deletions src/littlefs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@
import warnings
from typing import TYPE_CHECKING, List, Tuple, Iterator, IO, Union, Optional

from pkg_resources import DistributionNotFound, get_distribution
try:
from importlib_metadata import version, PackageNotFoundError
except ImportError:
from importlib.metadata import version, PackageNotFoundError


from . import errors, lfs
from .lfs import __LFS_DISK_VERSION__, __LFS_VERSION__
from .errors import LittleFSError


try:
__version__ = get_distribution('littlefs-python').version
except DistributionNotFound:
__version__ = version("littlefs-python")
except PackageNotFoundError:
# Package not installed
pass

Expand Down

0 comments on commit 796a8d8

Please sign in to comment.