diff options
| -rw-r--r-- | .bumpversion.cfg | 2 | ||||
| -rw-r--r-- | CHANGES.rst | 9 | ||||
| -rw-r--r-- | changelog.d/2493.change.rst | 2 | ||||
| -rw-r--r-- | changelog.d/2525.doc.rst | 1 | ||||
| -rw-r--r-- | docs/userguide/entry_point.rst | 2 | ||||
| -rw-r--r-- | pkg_resources/__init__.py | 3 | ||||
| -rw-r--r-- | setup.cfg | 5 |
7 files changed, 19 insertions, 5 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 60e7352f..432c8130 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 51.1.1 +current_version = 51.1.2 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index ca76648b..5f69c6ab 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,12 @@ +v51.1.2 +------- + + +Misc +^^^^ +* #2505: Disable inclusion of package data as it causes 'tests' to be included as data. + + v51.1.1 ------- diff --git a/changelog.d/2493.change.rst b/changelog.d/2493.change.rst new file mode 100644 index 00000000..f2c46932 --- /dev/null +++ b/changelog.d/2493.change.rst @@ -0,0 +1,2 @@ +Use importlib.import_module() rather than the deprectated loader.load_module() +in pkg_resources namespace delaration -- by :user:`encukou` diff --git a/changelog.d/2525.doc.rst b/changelog.d/2525.doc.rst new file mode 100644 index 00000000..5d7ad5d3 --- /dev/null +++ b/changelog.d/2525.doc.rst @@ -0,0 +1 @@ +Fix typo in the document page about entry point. -- by :user:`jtr109` diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst index edab4465..73820728 100644 --- a/docs/userguide/entry_point.rst +++ b/docs/userguide/entry_point.rst @@ -28,7 +28,7 @@ with ``__init__.py`` as: .. code-block:: python - def helloworld(): + def hello_world(): print("Hello world") and ``__main__.py`` providing a hook: diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 737f4d5f..99b7f680 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -38,6 +38,7 @@ import itertools import inspect import ntpath import posixpath +import importlib from pkgutil import get_importer try: @@ -2209,7 +2210,7 @@ def _handle_ns(packageName, path_item): if subpath is not None: path = module.__path__ path.append(subpath) - loader.load_module(packageName) + importlib.import_module(packageName) _rebuild_mod_path(path, packageName, module) return subpath @@ -1,7 +1,7 @@ [metadata] license_file = LICENSE name = setuptools -version = 51.1.1 +version = 51.1.2 author = Python Packaging Authority author_email = distutils-sig@python.org description = Easily download, build, install, upgrade, and uninstall Python packages @@ -24,7 +24,8 @@ project_urls = [options] packages = find: py_modules = easy_install -include_package_data = true +# disabled as it causes tests to be included #2505 +# include_package_data = true python_requires = >=3.6 install_requires = |