From 331f2be9157d774d6db20b80666db5c363d386ad Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 20 Jun 2019 15:54:31 -0600 Subject: [PATCH 1/4] Updating the changelog for the 5.7.1 release and adding dates of past releases --- CHANGELOG.txt | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index af34633b..ef3f6167 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,11 +3,14 @@ ==================== ------------------------------------------------------------------------------- - Current Development + Version 5.7.1 21 Jun 2019 ------------------------------------------------------------------------------- +- StreamIndenter fix for blank lines (#58) +- Fix in Excel interface to avoid closing previously open Excel windows (#59) + ------------------------------------------------------------------------------- - Version 5.7.0 + Version 5.7.0 1 May 2019 ------------------------------------------------------------------------------- - Disable nose's use of docstrings for test descriptions (#54) @@ -17,13 +20,13 @@ - Fix component loader (#51) ------------------------------------------------------------------------------- - Version 5.6.5 + Version 5.6.5 18 Jan 2019 ------------------------------------------------------------------------------- - Fix condition where subprocess exits before I/O threads were created (#49) ------------------------------------------------------------------------------- - Version 5.6.4 + Version 5.6.4 19 Dec 2018 ------------------------------------------------------------------------------- - Fix IOptionDataProvider methods missing 'self' argument (#34) @@ -36,7 +39,7 @@ - Fix and simplify file comparison operators (#47) ------------------------------------------------------------------------------- - Version 5.6.3 + Version 5.6.3 9 Apr 2018 ------------------------------------------------------------------------------- - Resolved enum test failure on Python 3.x @@ -45,13 +48,13 @@ - Fix for setting a ConfigBlock with keys that contains spaces/underscores. ------------------------------------------------------------------------------- - Version 5.6.2 + Version 5.6.2 28 Feb 2018 ------------------------------------------------------------------------------- - Resolving appveyor test failures. ------------------------------------------------------------------------------- - Version 5.6.1 + Version 5.6.1 23 Feb 2018 ------------------------------------------------------------------------------- - Minor cleanup of ConfigBlock class. @@ -60,7 +63,7 @@ - Adding line wrapping to the LogHandler ------------------------------------------------------------------------------- - Version 5.6 + Version 5.6 21 Oct 2017 ------------------------------------------------------------------------------- - Changed the default logic for ExcelSpreadsheet to use xldrd when available @@ -72,14 +75,14 @@ - Introduced contiguous task processing in pyutilib.worker ------------------------------------------------------------------------------- - Version 5.5.1 + Version 5.5.1 18 Jun 2017 ------------------------------------------------------------------------------- - Fix for making private copies of os.environ - Defer imports of pyutilib.misc in pyutilib.th to improve coverage ------------------------------------------------------------------------------- - Version 5.5 + Version 5.5 13 May 2017 ------------------------------------------------------------------------------- - Close a pyro worker if an exception occurs @@ -90,7 +93,7 @@ - Changes to make ConfigBlock add more like dict ------------------------------------------------------------------------------- - Version 5.4.1 + Version 5.4.1 30 Oct 2016 ------------------------------------------------------------------------------- - Updates to work with OpenPyxl 2.4 From 58cfee548980cc21e4c959ec54b57f2fbe245af7 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 21 Jun 2019 08:43:03 -0600 Subject: [PATCH 2/4] Remove README.txt --- CHANGELOG.txt | 1 + README.md | 2 +- README.txt | 8 -------- setup.py | 14 ++++++++++++-- 4 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 README.txt diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ef3f6167..594b8631 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -8,6 +8,7 @@ - StreamIndenter fix for blank lines (#58) - Fix in Excel interface to avoid closing previously open Excel windows (#59) +- Removed README.txt, standardizing on README.md ------------------------------------------------------------------------------- Version 5.7.0 1 May 2019 diff --git a/README.md b/README.md index a2bab65e..cf923939 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![codecov.io](https://codecov.io/github/PyUtilib/pyutilib/coverage.svg?branch=master)](https://codecov.io/github/PyUtilib/pyutilib?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/PyUtilib/pyutilib/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PyUtilib/pyutilib/?branch=master) [![Depsy Software Impact](http://depsy.org/api/package/pypi/PyUtilib/badge.svg)](http://depsy.org/package/python/PyUtilib) -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) +[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) ## PyUtilib Overview diff --git a/README.txt b/README.txt deleted file mode 100644 index b3e90e30..00000000 --- a/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -The PyUtilib project supports a collection of Python utilities, -including a well-developed component architecture and extensions -to the PyUnit testing framework. PyUtilib has been developed to -support several Python-centric projects, especially -`Pyomo `_. - -PyUtilib is developed on Github: https://github.com/PyUtilib/pyutilib, -and it is is available under the BSD License. diff --git a/setup.py b/setup.py index 93ef09f6..106e111e 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,16 @@ def _find_packages(path): return [pkg for pkg in map(lambda x:x.replace(os.sep,"."), pkg_list)] def read(*rnames): - return open(os.path.join(os.path.dirname(__file__), *rnames)).read() + with open(os.path.join(os.path.dirname(__file__), *rnames)) as README: + # Strip all leading badges up to, but not including the COIN-OR + # badge so that they do not appear in the PyPI description + while True: + line = README.readline() + if 'COIN-OR' in line: + break + if line.strip() and '[![' not in line: + break + return line + README.read() packages = _find_packages('pyutilib') @@ -56,7 +65,8 @@ def read(*rnames): platforms = ["any"], python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', description = 'PyUtilib: A collection of Python utilities', - long_description = read('README.txt'), + long_description = read('README.md'), + long_description_content_type='text/markdown', classifiers = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: End Users/Desktop', From 5b7ecbad9cb50a6121ef7b6fe78d0ac4e235fa8f Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 21 Jun 2019 08:45:22 -0600 Subject: [PATCH 3/4] Bumping version to 5.7.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 106e111e..37b18c7d 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def read(*rnames): requires.append('ordereddict') setup(name="PyUtilib", - version='5.7.1.dev0', + version='5.7.1', maintainer='William E. Hart', maintainer_email='wehart@sandia.gov', url = 'https://github.com/PyUtilib/pyutilib', From 18e630bf3c3cba99901b89db872dcbb0e9486aa7 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 21 Jun 2019 08:47:12 -0600 Subject: [PATCH 4/4] Updating the RELEASE.txt --- RELEASE.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE.txt b/RELEASE.txt index af524ba5..42bf7ade 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -We are pleased to announce the release of PyUtilib 5.7.0. The +We are pleased to announce the release of PyUtilib 5.7.1. The PyUtilib project supports the development of an ensemble of Python packages that include a wide variety of utilities, including a well-developed component architecture. @@ -7,6 +7,7 @@ The following are highlights of the 5.7 release series: - Dropped support for Python 2.6 - Updates to resolve testing issues +- Minor bug fixes PyUtilib can be installed from PyPI using pip or conda-forge using conda.