Final changes for Pyomo 5.1.1

IntroCursos · Jan 8, 2017 · 7826088 · 7826088
1 parent 1bd542c
commit 7826088
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,12 @@
 Pyomo CHANGELOG
 ===============
 
+-------------------------------------------------------------------------------
+Pyomo 5.1.1
+-------------------------------------------------------------------------------
+
+- Monkeypatch to resolve (#95)
+
 -------------------------------------------------------------------------------
 Pyomo 5.1
 -------------------------------------------------------------------------------

diff --git a/pyomo/version/__init__.py b/pyomo/version/__init__.py
@@ -24,8 +24,8 @@
 # development and set to 'final' for releases.
 _major=5
 _minor=1
-_micro=0
-_releaselevel='invalid'
+_micro=1
+_releaselevel='final'
 _serial=0
 
 if _releaselevel == 'final':

diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@ def read(*rnames):
       #     pyomo/pyomo/version/__init__.py
       #     pyomo/RELEASE.txt
       #
-      version='5.1',
+      version='5.1.1',
       maintainer='William E. Hart',
       maintainer_email='wehart@sandia.gov',
       url='http://pyomo.org',
@@ -84,7 +84,7 @@ def read(*rnames):
           ],
       packages=packages,
       keywords=['optimization'],
-      namespace_packages=['pyomo', 'pyomo.data'],
+      namespace_packages=['pyomo'],
       install_requires=requires,
       entry_points="""
         [console_scripts]