diff --git a/CHANGES.rst b/CHANGES.rst index 72e744e..506e8eb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,11 +2,16 @@ Changes ======= -1.5.2 (unreleased) +1.5.2 (2019-10-31) ------------------ - Add support for Python 3.8. +- Fix a bug where a package/module with a name that is a prefix of another + package/module might accidentally be used instead of the other one (e.g. py + instead of pylab). See `issue 10 + `_. + 1.5.1 (2019-04-23) ------------------ diff --git a/findimports.py b/findimports.py index b50809c..2626d4f 100755 --- a/findimports.py +++ b/findimports.py @@ -80,7 +80,7 @@ from operator import attrgetter -__version__ = '1.5.2.dev0' +__version__ = '1.5.2' __author__ = 'Marius Gedminas ' __licence__ = 'GPL v2 or later' __url__ = 'https://github.com/mgedmin/findimports' diff --git a/release.mk b/release.mk index f408d2c..01e8690 100644 --- a/release.mk +++ b/release.mk @@ -1,4 +1,4 @@ -# release.mk version 1.3 (2018-11-03) +# release.mk version 1.4 (2019-04-23) # # Helpful Makefile rules for releasing Python packages. # https://github.com/mgedmin/python-project-skel @@ -8,11 +8,13 @@ FILE_WITH_VERSION ?= setup.py FILE_WITH_CHANGELOG ?= CHANGES.rst CHANGELOG_DATE_FORMAT ?= %Y-%m-%d CHANGELOG_FORMAT ?= $(changelog_ver) ($(changelog_date)) +DISTCHECK_DIFF_OPTS ?= $(DISTCHECK_DIFF_DEFAULT_OPTS) # These should be fine PYTHON ?= python PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine check dist/* && twine upload dist/* LATEST_RELEASE_MK_URL = https://raw.githubusercontent.com/mgedmin/python-project-skel/master/release.mk +DISTCHECK_DIFF_DEFAULT_OPTS = -x PKG-INFO -x setup.cfg -x '*.egg-info' -I'^\#' # These should be fine, as long as you use Git VCS_GET_LATEST ?= git pull @@ -55,7 +57,7 @@ distcheck-sdist: $(VCS_EXPORT) && \ cd tmp && \ tar -xzf ../dist/$$pkg_and_version.tar.gz && \ - diff -ur $$pkg_and_version tree -x PKG-INFO -x setup.cfg -x '*.egg-info' -I'^#' && \ + diff -ur $$pkg_and_version tree $(DISTCHECK_DIFF_OPTS) && \ cd $$pkg_and_version && \ make dist check && \ cd .. && \