Browse Source

Removed utils dependency.

modified:   setup.py
	modified:   src/wstools/tests/test_t1.py
	modified:   src/wstools/version.py
	modified:   tox
main
root 11 years ago
parent
commit
7b5402e7e7
4 changed files with 23 additions and 6 deletions
  1. +2
    -2
      setup.py
  2. +5
    -1
      src/wstools/tests/test_t1.py
  3. +1
    -1
      src/wstools/version.py
  4. +15
    -2
      tox

+ 2
- 2
setup.py View File

@@ -29,6 +29,6 @@ setup(
packages=find_packages('src'),
package_dir={'': 'src'},
include_package_data=True,
install_requires=['utils'],
tests_require=['pytest', 'tox', 'utils'],
install_requires=[],
tests_require=['pytest', 'tox'],
)

+ 5
- 1
src/wstools/tests/test_t1.py View File

@@ -4,8 +4,12 @@
###########################################################################
import unittest
import test_wsdl
"""
import utils

TODO: find where the hell is the missing utils package what is supposed to contain the MatchTestLoader()

import utils

def makeTestSuite():
suite = unittest.TestSuite()
@@ -16,6 +20,6 @@ def makeTestSuite():
def main():
loader = utils.MatchTestLoader(True, None, "makeTestSuite")
unittest.main(defaultTest="makeTestSuite", testLoader=loader)
"""
if __name__ == "__main__":
main()

+ 1
- 1
src/wstools/version.py View File

@@ -1 +1 @@
__version__ = "0.4.1"
__version__ = "0.4.2"

+ 15
- 2
tox View File

@@ -1,5 +1,18 @@
#!/bin/bash
set -e


if which virtualenv >/dev/null; then
echo
else
apt-get install -y python-virtualenv
if [ $? -ne 0 ]; then
echo "failed to install virtualenv, you'll have to fix this yourself"
exit 1
fi
fi


if [ -z "$VIRTUAL_ENV" ]
then
virtualenv .tox/tox
@@ -14,8 +27,8 @@ then
exit 1
fi

pip install tox
#pip install tox -v
# pytest pytest-cov

tox
tox -v


Loading…
Cancel
Save