[Python-modules-commits] [pyutilib] 01/04: Import pyutilib_5.3.5.orig.tar.xz
Daniel Stender
danstender-guest at moszumanska.debian.org
Sun May 8 07:14:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
danstender-guest pushed a commit to branch master
in repository pyutilib.
commit 5183de3226e6be0b330a6f6151733d5b5eb100cc
Author: Daniel Stender <stender at debian.org>
Date: Sun May 8 09:10:31 2016 +0200
Import pyutilib_5.3.5.orig.tar.xz
---
.coveragerc | 7 ++++
.travis.yml | 48 ++++++++++++++++++++++
CHANGELOG.txt | 18 +++++++++
README.md | 6 ++-
PYPI.txt => README.txt | 0
appveyor.yml | 59 ++++++++++++++++++++++++++++
install_jython.sh | 36 +++++++++++++++++
pyutilib/dev/runtests.py | 11 ++++--
pyutilib/math/tests/test_math.py | 18 ++++-----
pyutilib/math/tests/test_numtypes.py | 7 ++--
pyutilib/misc/tests/test_archivereader.py | 5 +--
pyutilib/misc/tests/test_config.py | 5 +--
pyutilib/misc/tests/test_cross.py | 5 +--
pyutilib/misc/tests/test_factory.py | 5 +--
pyutilib/misc/tests/test_import.py | 5 +--
pyutilib/misc/tests/test_io.py | 8 +---
pyutilib/misc/tests/test_json.py | 6 +--
pyutilib/misc/tests/test_method.py | 7 +---
pyutilib/misc/tests/test_misc.py | 6 +--
pyutilib/misc/tests/test_singleton.py | 7 +---
pyutilib/misc/tests/test_smap.py | 6 +--
pyutilib/misc/tests/test_xml.py | 6 +--
pyutilib/misc/tests/test_yaml.py | 6 +--
pyutilib/subprocess/tests/test_subprocess.py | 12 +++---
setup.py | 17 +++-----
25 files changed, 220 insertions(+), 96 deletions(-)
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..0508187
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,7 @@
+[report]
+omit =
+ */python?.?/*
+ */site-packages/nose/*
+ *__init__*
+ setup.py
+ */tests/*
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d05ea0a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,48 @@
+language: python
+matrix:
+ include:
+ - python: '2.6'
+ env: PYRO="Pyro" YAML="pyyaml"
+ - python: '2.7'
+ env: PYRO="Pyro" YAML="pyyaml"
+install:
+- if [ -n "${JYTHON}" ]; then source install_jython.sh; fi
+- if [ -n "${YAML}" ]; then pip install pyyaml; fi
+- if [ "${TRAVIS_PYTHON_VERSION}" = "2.6" ]; then pip install ordereddict; fi
+- pip install xlrd
+- pip install openpyxl
+- pip install $PYRO
+- pip install coverage
+- python setup.py develop
+script:
+- cd ..
+- cp pyutilib/.coveragerc .
+- test.pyutilib --cat=nightly --cov
+after_success:
+- pip install codecov
+- codecov
+- pip install python-coveralls
+- coveralls
+- cd $TRAVIS_BUILD_DIR
+deploy:
+- provider: pypi
+ server: https://testpypi.python.org/pypi # Updated
+ user: whart111
+ password:
+ secure: "bxNfz0XywTc4vL2M39eEeYvTzDIjhwddzHRljCPCkP8ANLuxh6DPxFvFZDNGw+TA/U0q7r7POuhloa1zen0WyrcoWtWmC4WlixNoJ5mIl1RWXqpUzV5VqReYfYDE6FJs9G0tCrcgF/vzyzajDH9atxUxCdAoWqUnOdx+XcOBarUuz5PTRbI+GLkI8IJCyOgS0khXvoLbj4qi+SW9aOS4EKTQMxv3EPy9V3HNNe4yzbmnCFfaEWUVCFVs5vH7x4WbD3CN2lyjaE5ZTQHrAx2GZtTgZWtyypmv0nfXQ49s32xw/CRb9POUUQ4IGQybAcD2bEJeqaV+6HB93yJVcy6gYCCm0WV++sL1gsD1vYcmtqpWloF4O/lnQkaW0fD4twJUjapXm8QqCFRtXBt7/DxL72vQu1MWbeBQs3Vxo+1xBqy64txhXmREeTEIBfvmTxMRkIvensxwh8uRlhd252iJQC2K6KlIcG5 [...]
+ distributions: sdist --format=gztar bdist_wheel
+ on:
+ tags: false
+ branch: master
+ python: '2.7'
+ condition: '"$YAML" = "pyyaml"'
+- provider: pypi
+ user: whart111
+ password:
+ secure: "bxNfz0XywTc4vL2M39eEeYvTzDIjhwddzHRljCPCkP8ANLuxh6DPxFvFZDNGw+TA/U0q7r7POuhloa1zen0WyrcoWtWmC4WlixNoJ5mIl1RWXqpUzV5VqReYfYDE6FJs9G0tCrcgF/vzyzajDH9atxUxCdAoWqUnOdx+XcOBarUuz5PTRbI+GLkI8IJCyOgS0khXvoLbj4qi+SW9aOS4EKTQMxv3EPy9V3HNNe4yzbmnCFfaEWUVCFVs5vH7x4WbD3CN2lyjaE5ZTQHrAx2GZtTgZWtyypmv0nfXQ49s32xw/CRb9POUUQ4IGQybAcD2bEJeqaV+6HB93yJVcy6gYCCm0WV++sL1gsD1vYcmtqpWloF4O/lnQkaW0fD4twJUjapXm8QqCFRtXBt7/DxL72vQu1MWbeBQs3Vxo+1xBqy64txhXmREeTEIBfvmTxMRkIvensxwh8uRlhd252iJQC2K6KlIcG5 [...]
+ distributions: sdist --format=gztar bdist_wheel
+ on:
+ tags: true
+ branch: master
+ python: '2.7'
+ condition: '"$YAML" = "pyyaml"'
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d88394b..a400707 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,24 @@
====================
-------------------------------------------------------------------------------
+ Version 5.3.5
+-------------------------------------------------------------------------------
+
+- Setting up auto-deployment to PyPI
+
+-------------------------------------------------------------------------------
+ Version 5.3.4
+-------------------------------------------------------------------------------
+
+- Updates to setup automated testing infrastructure.
+
+-------------------------------------------------------------------------------
+ Version 5.3.3
+-------------------------------------------------------------------------------
+
+- Documentation update.
+
+-------------------------------------------------------------------------------
Version 5.3.2
-------------------------------------------------------------------------------
diff --git a/README.md b/README.md
index 098464d..0b27ee1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-## Overview
+[](https://travis-ci.org/PyUtilib/pyutilib) [](https://ci.appveyor.com/project/WilliamHart/pyutilib) [](https://codecov.io/github/PyUtilib/pyutilib?branch=master) [ at the time of writing.
+
+ - PYTHON: "C:\\Python27"
+ #- PYTHON: "C:\\Python33"
+ - PYTHON: "C:\\Python34"
+ - PYTHON: "C:\\Python35"
+ - PYTHON: "C:\\Python27-x64"
+ #- PYTHON: "C:\\Python33-x64"
+ # DISTUTILS_USE_SDK: "1"
+ - PYTHON: "C:\\Python34-x64"
+ DISTUTILS_USE_SDK: "1"
+ - PYTHON: "C:\\Python35-x64"
+
+install:
+ # We need wheel installed to build wheels
+ - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+ - "python --version"
+ - "python -m pip install coverage"
+ - "python -m pip install nose"
+ - "dir %PYTHON%\\Scripts"
+
+build: off
+
+test_script:
+ # Put your test command here.
+ # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4,
+ # you can remove "build.cmd" from the front of the command, as it's
+ # only needed to support those cases.
+ # Note that you must use the environment variable %PYTHON% to refer to
+ # the interpreter you're using - Appveyor does not do anything special
+ # to put the Python evrsion you want to use on PATH.
+ - "%PYTHON%\\python.exe setup.py develop"
+ - "%PYTHON%\\Scripts\\test.pyutilib.exe --cat=nightly --cov -v"
+
+#after_test:
+ # This step builds your wheels.
+ # Again, you only need build.cmd if you're building C extensions for
+ # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct
+ # interpreter
+ #- "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel"
+
+#artifacts:
+ # bdist_wheel puts your built wheel in the dist directory
+ #- path: dist\*
+
+on_success:
+# You can use this step to upload your artifacts to a public website.
+# See Appveyor's documentation for more details. Or you can simply
+# access your wheels from the Appveyor "artifacts" tab for your build.
+ - pip install codecov
+ - cp ../.coverage .
+ - codecov
diff --git a/install_jython.sh b/install_jython.sh
new file mode 100755
index 0000000..c05bf54
--- /dev/null
+++ b/install_jython.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#export JYTHON=org.python:jython-installer:2.7.0
+#export HOME=/Users/wehart/src/python27/src/pyutilib
+#export VIRTUAL_ENV=$HOME
+#printenv $HOME
+#jip install joda-time:joda-time:2.3
+set -e
+#set -v
+
+pip install jip
+jip install $JYTHON
+
+#
+# Install Jython
+#
+NON_GROUP_ID=${JYTHON#*:}
+_JYTHON_BASENAME=${NON_GROUP_ID/:/-}
+export CLASSPATH=$VIRTUAL_ENV/javalib/*
+java -jar $VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $HOME/jython
+
+#
+# Create virtual environment
+#
+# pip isn't available in 2.7.0, so we need to use an older version of virtualenv
+#
+pip install virtualenv==1.9.1
+virtualenv --version
+virtualenv -p $HOME/jython/bin/jython $HOME/myvirtualenv
+$HOME/myvirtualenv/bin/pip install nose
+
+#
+# Install packages into the jython virtual environment
+#
+export PATH=$HOME/myvirtualenv/bin:$PATH
+#ls $HOME/myvirtualenv/bin
diff --git a/pyutilib/dev/runtests.py b/pyutilib/dev/runtests.py
index 3f4f948..3ed4c66 100755
--- a/pyutilib/dev/runtests.py
+++ b/pyutilib/dev/runtests.py
@@ -83,8 +83,9 @@ def run(package, argv, use_exec=True):
if os.path.isdir(dir):
srcdirs.append(os.path.abspath(dir))
os.environ['PYTHONPATH']=os.pathsep.join(srcdirs)
- cmd = [ os.path.join(sys.exec_prefix,'Scripts','python.exe'),
- os.path.join(sys.exec_prefix,'Scripts','nosetests-script.py') ]
+ #cmd = [ os.path.join(sys.exec_prefix,'Scripts','python.exe'),
+ # os.path.join(sys.exec_prefix,'Scripts','nosetests-script.py') ]
+ cmd = [ os.path.join(sys.exec_prefix,'Scripts','nosetests.exe') ]
os.environ['PATH'] = os.path.join(cwd,'Scripts') + os.pathsep + \
os.environ.get('PATH','')
else:
@@ -105,7 +106,11 @@ def run(package, argv, use_exec=True):
print("Running... "+' '.join(cmd))
print("")
- if options.output:
+ if sys.platform.startswith('java'):
+ import subprocess
+ p = subprocess.Popen(cmd)
+ p.wait()
+ elif options.output:
sys.stdout.write("Redirecting output to file '%s' ..." % options.output)
sys.stdout.flush()
pyutilib.subprocess.run(cmd, outfile=options.output)
diff --git a/pyutilib/math/tests/test_math.py b/pyutilib/math/tests/test_math.py
index e1b7046..bd5aed9 100644
--- a/pyutilib/math/tests/test_math.py
+++ b/pyutilib/math/tests/test_math.py
@@ -3,14 +3,14 @@
#
#
-
import unittest
import pyutilib.math
+
class MathDebug(unittest.TestCase):
def test_isint(self):
- """Verify that isint() identifies ints"""
+ # Verify that isint() identifies ints
if pyutilib.math.isint([1,2]):
self.fail("test_isint - thought that a list was an integer")
if pyutilib.math.isint("a"):
@@ -29,21 +29,21 @@ class MathDebug(unittest.TestCase):
self.fail("test_isint - thought that an integer was not an integer")
def test_argmax(self):
- """ Test that argmax works """
+ # Test that argmax works
a=[0,1,2,3]
self.assertEqual(a[pyutilib.math.argmax(a)],a[3])
a=[3,2,1,0]
self.assertEqual(a[pyutilib.math.argmax(a)],a[0])
def test_argmin(self):
- """ Test that argmin works """
+ # Test that argmin works
a=[0,1,2,3]
self.assertEqual(a[pyutilib.math.argmin(a)],a[0])
a=[3,2,1,0]
self.assertEqual(a[pyutilib.math.argmin(a)],a[3])
def test_mean(self):
- """Verify that mean() works"""
+ # Verify that mean() works
self.assertEqual(pyutilib.math.mean((1,2,3)),2.0)
try:
val = pyutilib.math.mean([])
@@ -52,7 +52,7 @@ class MathDebug(unittest.TestCase):
pass
def test_median(self):
- """Verify that median() works"""
+ # Verify that median() works
self.assertEqual(pyutilib.math.median((1,2,3)),2.0)
self.assertEqual(pyutilib.math.median((2,)),2.0)
self.assertEqual(pyutilib.math.median((1,2,3,4)),2.5)
@@ -63,7 +63,7 @@ class MathDebug(unittest.TestCase):
pass
def test_factorial(self):
- """Verify that factorial() works"""
+ # Verify that factorial() works
self.assertEqual(pyutilib.math.factorial(0),1)
self.assertEqual(pyutilib.math.factorial(1),1)
self.assertEqual(pyutilib.math.factorial(2),2)
@@ -75,11 +75,11 @@ class MathDebug(unittest.TestCase):
except ArithmeticError:
pass
-
def test_perm(self):
- """Verify that perm() works"""
+ # Verify that perm() works
self.assertEqual(pyutilib.math.perm(7,1),7)
self.assertEqual(pyutilib.math.perm(7,2),21)
+
if __name__ == "__main__":
unittest.main()
diff --git a/pyutilib/math/tests/test_numtypes.py b/pyutilib/math/tests/test_numtypes.py
index 6e3a77a..94b2ae0 100644
--- a/pyutilib/math/tests/test_numtypes.py
+++ b/pyutilib/math/tests/test_numtypes.py
@@ -4,14 +4,14 @@
#
import os
-
import unittest
import pyutilib.math
+
class NumTypesDebug(unittest.TestCase):
def test_infinity1(self):
- """Check that infinity is defined appropriately"""
+ # Check that infinity is defined appropriately
if 1 > pyutilib.math.infinity:
self.fail("test_infinity")
if not ((1.0/pyutilib.math.infinity) == 0.0):
@@ -28,7 +28,7 @@ class NumTypesDebug(unittest.TestCase):
self.fail("test_infinity - 'foo' is not infinite")
def test_nan(self):
- """Check that nan is defined appropriately"""
+ # Check that nan is defined appropriately
if not type(pyutilib.math.nan) is type(1.0):
self.fail("test_nan")
if not pyutilib.math.is_nan(pyutilib.math.infinity/pyutilib.math.infinity):
@@ -40,5 +40,6 @@ class NumTypesDebug(unittest.TestCase):
if pyutilib.math.is_nan('foo'):
self.fail("test_nan - 'foo' is not NaN")
+
if __name__ == "__main__":
unittest.main()
diff --git a/pyutilib/misc/tests/test_archivereader.py b/pyutilib/misc/tests/test_archivereader.py
index d60b90c..0f73db4 100644
--- a/pyutilib/misc/tests/test_archivereader.py
+++ b/pyutilib/misc/tests/test_archivereader.py
@@ -8,10 +8,7 @@ import sys
import fnmatch
import posixpath
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
from pyutilib.misc.archivereader import \
ArchiveReaderFactory, DirArchiveReader, FileArchiveReader, \
diff --git a/pyutilib/misc/tests/test_config.py b/pyutilib/misc/tests/test_config.py
index f918c88..cd03217 100644
--- a/pyutilib/misc/tests/test_config.py
+++ b/pyutilib/misc/tests/test_config.py
@@ -11,10 +11,7 @@ import sys
import os
import os.path
currdir = os.path.dirname(os.path.abspath(__file__))
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
import pyutilib.misc.comparison
from pyutilib.misc.config import ConfigValue, ConfigBlock, ConfigList
diff --git a/pyutilib/misc/tests/test_cross.py b/pyutilib/misc/tests/test_cross.py
index 667d635..0ffa5eb 100644
--- a/pyutilib/misc/tests/test_cross.py
+++ b/pyutilib/misc/tests/test_cross.py
@@ -6,10 +6,7 @@
from os.path import abspath, dirname
pkgdir = dirname(abspath(__file__))+"/../.."
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
import pyutilib.misc
class CrossDebug(unittest.TestCase):
diff --git a/pyutilib/misc/tests/test_factory.py b/pyutilib/misc/tests/test_factory.py
index c44ee6e..3fef6e6 100644
--- a/pyutilib/misc/tests/test_factory.py
+++ b/pyutilib/misc/tests/test_factory.py
@@ -6,10 +6,7 @@
from os.path import abspath, dirname
pkgdir = dirname(abspath(__file__))+"/../.."
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
import pyutilib.misc
class FactoryDebug(unittest.TestCase):
diff --git a/pyutilib/misc/tests/test_import.py b/pyutilib/misc/tests/test_import.py
index c49383a..d6ee3fb 100644
--- a/pyutilib/misc/tests/test_import.py
+++ b/pyutilib/misc/tests/test_import.py
@@ -10,10 +10,7 @@ pkgdir = dirname(abspath(__file__))+os.sep+".."+os.sep+".."
currdir = dirname(abspath(__file__))+os.sep
import pyutilib.misc
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
import pyutilib.misc.comparison
try:
diff --git a/pyutilib/misc/tests/test_io.py b/pyutilib/misc/tests/test_io.py
index 49c31c1..008846c 100644
--- a/pyutilib/misc/tests/test_io.py
+++ b/pyutilib/misc/tests/test_io.py
@@ -8,15 +8,11 @@ import sys
from os.path import abspath, dirname
pkgdir = dirname(abspath(__file__))+os.sep+".."+os.sep+".."
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
+import six
+import pyutilib.th as unittest
import pyutilib.misc
-import six
-
def filter1(str):
return True
diff --git a/pyutilib/misc/tests/test_json.py b/pyutilib/misc/tests/test_json.py
index 43ed896..4602b1f 100644
--- a/pyutilib/misc/tests/test_json.py
+++ b/pyutilib/misc/tests/test_json.py
@@ -6,11 +6,7 @@
import os
from os.path import abspath, dirname
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
try:
diff --git a/pyutilib/misc/tests/test_method.py b/pyutilib/misc/tests/test_method.py
index 1f20495..62f7f6b 100644
--- a/pyutilib/misc/tests/test_method.py
+++ b/pyutilib/misc/tests/test_method.py
@@ -3,13 +3,10 @@
#
#
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
+
class MethodDebug(unittest.TestCase):
def test_add_method(self):
diff --git a/pyutilib/misc/tests/test_misc.py b/pyutilib/misc/tests/test_misc.py
index b038874..07abccb 100644
--- a/pyutilib/misc/tests/test_misc.py
+++ b/pyutilib/misc/tests/test_misc.py
@@ -8,11 +8,7 @@ import sys
import os
from os.path import abspath, dirname
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
class Test(unittest.TestCase):
diff --git a/pyutilib/misc/tests/test_singleton.py b/pyutilib/misc/tests/test_singleton.py
index 0a36e17..8efbbfc 100644
--- a/pyutilib/misc/tests/test_singleton.py
+++ b/pyutilib/misc/tests/test_singleton.py
@@ -6,13 +6,10 @@
import os
from os.path import abspath, dirname
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
+
class A(pyutilib.misc.MonoState):
def __init__(self):
diff --git a/pyutilib/misc/tests/test_smap.py b/pyutilib/misc/tests/test_smap.py
index b125275..9309382 100644
--- a/pyutilib/misc/tests/test_smap.py
+++ b/pyutilib/misc/tests/test_smap.py
@@ -7,11 +7,7 @@ import os
import sys
from os.path import abspath, dirname
currdir = dirname(abspath(__file__))+os.sep
-
-try:
- import unittest2 as unittest
-except:
- import unittest
+import pyutilib.th as unittest
import pyutilib.misc
diff --git a/pyutilib/misc/tests/test_xml.py b/pyutilib/misc/tests/test_xml.py
index 368fe59..2a09e0d 100644
--- a/pyutilib/misc/tests/test_xml.py
+++ b/pyutilib/misc/tests/test_xml.py
@@ -7,11 +7,7 @@ import os
from os.path import abspath, dirname
pkgdir = dirname(abspath(__file__))
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
from xml.dom import minidom
diff --git a/pyutilib/misc/tests/test_yaml.py b/pyutilib/misc/tests/test_yaml.py
index beeeb66..5c91cd3 100644
--- a/pyutilib/misc/tests/test_yaml.py
+++ b/pyutilib/misc/tests/test_yaml.py
@@ -6,11 +6,7 @@
import os
from os.path import abspath, dirname
currdir = dirname(abspath(__file__))+os.sep
-try:
- import unittest2 as unittest
-except:
- import unittest
-
+import pyutilib.th as unittest
import pyutilib.misc
try:
diff --git a/pyutilib/subprocess/tests/test_subprocess.py b/pyutilib/subprocess/tests/test_subprocess.py
index 0ec22ea..1be76e1 100644
--- a/pyutilib/subprocess/tests/test_subprocess.py
+++ b/pyutilib/subprocess/tests/test_subprocess.py
@@ -95,7 +95,7 @@ class Test(unittest.TestCase):
INPUT.close()
os.remove(currdir+'tee.out')
if _peek_available:
- self.assertEquals( output.splitlines(),
+ self.assertEquals( sorted(output.splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
else:
sys.stderr.write("BEGIN OUTPUT:\n"+output+"END OUTPUT\n")
@@ -109,7 +109,7 @@ class Test(unittest.TestCase):
[sys.executable, currdir+"tee_script.py"], ostream=script_out )
if _peek_available:
- self.assertEquals( script_out.getvalue().splitlines(),
+ self.assertEquals( sorted(script_out.getvalue().splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
else:
sys.stderr.write("BEGIN OUTPUT:\n"+script_out.getvalue()+"END OUTPUT\n")
@@ -128,9 +128,9 @@ class Test(unittest.TestCase):
pyutilib.misc.reset_redirect()
# The following is only deterministic if Peek/Select is available
if _peek_available:
- self.assertEquals( stream_out.getvalue().splitlines(),
+ self.assertEquals( sorted(stream_out.getvalue().splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
- self.assertEquals( script_out.getvalue().splitlines(),
+ self.assertEquals( sorted(script_out.getvalue().splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
else:
sys.stderr.write("BEGIN OUTPUT1:\n"+stream_out.getvalue()+"END OUTPUT1\n")
@@ -155,7 +155,7 @@ class Test(unittest.TestCase):
# The following is only deterministic if Peek/Select is available
if _peek_available:
- self.assertEquals( script_out.getvalue().splitlines(),
+ self.assertEquals( sorted(script_out.getvalue().splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
else:
sys.stderr.write("BEGIN OUTPUT:\n"+script_out.getvalue()+"END OUTPUT\n")
@@ -176,7 +176,7 @@ class Test(unittest.TestCase):
# The following is only deterministic if Peek/Select is available
if _peek_available:
- self.assertEquals( script_out.getvalue().splitlines(),
+ self.assertEquals( sorted(script_out.getvalue().splitlines()),
["Tee Script: ERR","Tee Script: OUT"] )
else:
sys.stderr.write("BEGIN OUTPUT:\n"+script_out.getvalue()+"END OUTPUT\n")
diff --git a/setup.py b/setup.py
index 5f39666..6d3e7ee 100644
--- a/setup.py
+++ b/setup.py
@@ -38,27 +38,21 @@ def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
packages = _find_packages('pyutilib')
-requires=[ 'nose',
- 'six'
- ]
+
+requires=[ 'nose', 'six' ]
if sys.version_info < (2,7):
requires.append('argparse')
requires.append('unittest2')
-extra = {}
-#if sys.version_info >= (3,):
- #extra['use_2to3'] = True
- #extra['convert_2to3_doctests'] = ['README.md']
-
setup(name="PyUtilib",
- version='5.3.2',
+ version='5.3.5',
maintainer='William E. Hart',
maintainer_email='wehart at sandia.gov',
url = 'https://github.com/PyUtilib/pyutilib',
license = 'BSD',
platforms = ["any"],
description = 'PyUtilib: A collection of Python utilities',
- long_description = read('PYPI.txt'),
+ long_description = read('README.txt'),
classifiers = [
'Development Status :: 4 - Beta',
'Intended Audience :: End Users/Desktop',
@@ -93,7 +87,6 @@ setup(name="PyUtilib",
checkCopyright = pyutilib.dev.checkCopyright:main
pyutilib_test_driver = pyutilib.autotest.driver:main
dispatch_srvr=pyutilib.pyro.dispatch_srvr:main
- """,
- **extra
+ """
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyutilib.git
More information about the Python-modules-commits
mailing list