From a8181c80e00dd3b11cbbd782a9b85983235fa6c6 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Tue, 30 Apr 2019 10:06:29 -0600 Subject: [PATCH 1/4] Updating CHANGELOG in preparation for upcoming release --- CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8d4c0dc0..0cd9e353 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,11 @@ Current Development ------------------------------------------------------------------------------- +- Disable nose's use of docstrings for test descriptions (#54) +- Resolve testing issues with new version of PyYAML (#53, #55) +- Resolve testing issues with subprocess (#53) +- Remove testing and support for Python 2.6 (#52) +- Fix component loader (#51) ------------------------------------------------------------------------------- Version 5.6.5 From f97cb1f02e673d9975e5b98930413c86bc1f998f Mon Sep 17 00:00:00 2001 From: John Siirola Date: Wed, 1 May 2019 15:24:14 -0600 Subject: [PATCH 2/4] Updating setup.py to reflect that python 2.6 is not supported --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 693b280a..e659df0a 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ def read(*rnames): 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'), classifiers = [ @@ -66,12 +67,12 @@ def read(*rnames): 'Operating System :: Unix', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: Jython', 'Programming Language :: Python :: Implementation :: PyPy', From 06c760c5ad89a28be15f6c6f77c50f1a7f4ab8c2 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Wed, 1 May 2019 15:28:10 -0600 Subject: [PATCH 3/4] Updating version number to 5.6.6 --- CHANGELOG.txt | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0cd9e353..a268c02c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,10 @@ Current Development ------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + Version 5.6.6 +------------------------------------------------------------------------------- + - Disable nose's use of docstrings for test descriptions (#54) - Resolve testing issues with new version of PyYAML (#53, #55) - Resolve testing issues with subprocess (#53) diff --git a/setup.py b/setup.py index e659df0a..791fcc9e 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def read(*rnames): requires.append('ordereddict') setup(name="PyUtilib", - version='5.6.6.dev0', + version='5.6.6', maintainer='William E. Hart', maintainer_email='wehart@sandia.gov', url = 'https://github.com/PyUtilib/pyutilib', From d679d9d6df18469ea982db541542cc2a1bf6e891 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Wed, 1 May 2019 15:31:21 -0600 Subject: [PATCH 4/4] Updating version to 5.7.0 --- CHANGELOG.txt | 2 +- RELEASE.txt | 10 ++++------ setup.py | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a268c02c..af34633b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -7,7 +7,7 @@ ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- - Version 5.6.6 + Version 5.7.0 ------------------------------------------------------------------------------- - Disable nose's use of docstrings for test descriptions (#54) diff --git a/RELEASE.txt b/RELEASE.txt index fd137339..af524ba5 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,14 +1,12 @@ -We are pleased to announce the release of PyUtilib 5.6.5. The +We are pleased to announce the release of PyUtilib 5.7.0. 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. -The following are highlights of the 5.6 release series: +The following are highlights of the 5.7 release series: -- Added a general visitor pattern in pyutilib.misc -- Improvements to the ConfigBlock class -- Improved I/O management -- Improved test script robustness +- Dropped support for Python 2.6 +- Updates to resolve testing issues PyUtilib can be installed from PyPI using pip or conda-forge using conda. diff --git a/setup.py b/setup.py index 791fcc9e..4f2fae72 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def read(*rnames): requires.append('ordereddict') setup(name="PyUtilib", - version='5.6.6', + version='5.7.0', maintainer='William E. Hart', maintainer_email='wehart@sandia.gov', url = 'https://github.com/PyUtilib/pyutilib',