Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR for finalizing the 5.7.1 release #60

Merged
merged 4 commits into from
Jun 21, 2019
Merged

PR for finalizing the 5.7.1 release #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
331f2be
Updating the changelog for the 5.7.1 release and adding dates of past…
blnicho Jun 20, 2019
58cfee5
Remove README.txt
jsiirola Jun 21, 2019
5b7ecba
Bumping version to 5.7.1
jsiirola Jun 21, 2019
18e630b
Updating the RELEASE.txt
jsiirola Jun 21, 2019
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
26 changes: 15 additions & 11 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
====================

-------------------------------------------------------------------------------
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)
- Removed README.txt, standardizing on README.md

-------------------------------------------------------------------------------
Version 5.7.0
Version 5.7.0 1 May 2019
-------------------------------------------------------------------------------

- Disable nose's use of docstrings for test descriptions (#54)
Expand All @@ -17,13 +21,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)
Expand All @@ -36,7 +40,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
Expand All @@ -45,13 +49,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.
Expand All @@ -60,7 +64,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
Expand All @@ -72,14 +76,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
Expand All @@ -90,7 +94,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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions README.txt
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion RELEASE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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.

Expand Down
16 changes: 13 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -48,15 +57,16 @@ 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',
license = 'BSD',
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',
Expand Down