From e0edf4d4a13de3596592545c1e969e3472b1d2b9 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 11 Jul 2013 15:50:07 -0400 Subject: [PATCH] Initial changes to import into StackForge. --- .hgignore => .gitignore | 3 --- .gitreview | 4 ++++ .hgsigs | 4 ---- .hgtags | 5 ----- build-req.pip => requirements.txt | 1 - setup.py | 13 ++++------- test-req.pip => test-requirements.txt | 1 - test_db.cfg | 12 +++++++++++ tox.ini | 31 +++++++++++++++++++++++++++ 9 files changed, 51 insertions(+), 23 deletions(-) rename .hgignore => .gitignore (92%) create mode 100644 .gitreview delete mode 100644 .hgsigs delete mode 100644 .hgtags rename build-req.pip => requirements.txt (87%) rename test-req.pip => test-requirements.txt (69%) create mode 100644 test_db.cfg create mode 100644 tox.ini diff --git a/.hgignore b/.gitignore similarity index 92% rename from .hgignore rename to .gitignore index d684eb8..5a7c657 100644 --- a/.hgignore +++ b/.gitignore @@ -1,6 +1,3 @@ -syntax: glob - - *.pyc *data/* *build/* diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b6645ca --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=stackforge/sqlalchemy-migrate.git diff --git a/.hgsigs b/.hgsigs deleted file mode 100644 index 3caa5b5..0000000 --- a/.hgsigs +++ /dev/null @@ -1,4 +0,0 @@ -65742e996d94a99c6a7e01e26acfbdaa6aba4efc 0 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 diff --git a/.hgtags b/.hgtags deleted file mode 100644 index 49c3e8e..0000000 --- a/.hgtags +++ /dev/null @@ -1,5 +0,0 @@ -cb01bf174b05b1590258d6c996b89f60ebd88e5a v0.6 -c2526dce0768f11e6bf88afb641a6a9058fa685c v0.6.1 -35038c66152bc1b0d37131da3049843a9ee4fbe7 v0.7 -fbb2817a1e3f556b9b3ec1a5569f3f94353da0cc v0.7.1 -ad06c76fc174be15e690f415c6c9a95017cc2f3b v0.7.2 diff --git a/build-req.pip b/requirements.txt similarity index 87% rename from build-req.pip rename to requirements.txt index 4e19428..2599c00 100644 --- a/build-req.pip +++ b/requirements.txt @@ -1,6 +1,5 @@ SQLAlchemy >= 0.6 decorator Tempita >= 0.4 -setuptools Sphinx sphinxcontrib_issuetracker diff --git a/setup.py b/setup.py index d63d6aa..24d4c30 100644 --- a/setup.py +++ b/setup.py @@ -2,21 +2,16 @@ import os -try: - from setuptools import setup, find_packages -except ImportError: - from ez_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages +import setuptools -required_deps = ['SQLAlchemy >= 0.6', 'decorator', 'Tempita >= 0.4', 'setuptools'] +required_deps = ['SQLAlchemy >= 0.6', 'decorator', 'Tempita >= 0.4'] readme_file = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'README')) -setup( +setuptools.setup( name = "sqlalchemy-migrate", version = "0.7.3", - packages = find_packages(exclude=["migrate.tests*"]), + packages = setuptools.find_packages(exclude=["migrate.tests*"]), include_package_data = True, description = "Database schema migration for SQLAlchemy", long_description = readme_file.read(), diff --git a/test-req.pip b/test-requirements.txt similarity index 69% rename from test-req.pip rename to test-requirements.txt index 5707d94..273f886 100644 --- a/test-req.pip +++ b/test-requirements.txt @@ -7,6 +7,5 @@ pytz psycopg2 pysqlite mysql-python -http://jenkins.gnuviech-server.de/userContent/kinterbasdb-3.3.0.tar.bz2 virtualenv unittest2 diff --git a/test_db.cfg b/test_db.cfg new file mode 100644 index 0000000..6dcff72 --- /dev/null +++ b/test_db.cfg @@ -0,0 +1,12 @@ +# test_db.cfg +# +# This file contains a list of connection strings which will be used by +# database tests. Tests will be executed once for each string in this file. +# You should be sure that the database used for the test doesn't contain any +# important data. See README for more information. +# +# The string '__tmp__' is substituted for a temporary file in each connection +# string. This is useful for sqlite tests. +sqlite:///__tmp__ +#postgresql://scott:tiger@localhost/test_migrate +#mysql://scott:tiger@localhost/test_migrate diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..efbb9f6 --- /dev/null +++ b/tox.ini @@ -0,0 +1,31 @@ +[tox] +envlist = py26,py27,py33,pep8 + +[testenv] +setenv = VIRTUAL_ENV={envdir} +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +commands = + nosetests {posargs} + +[testenv:pep8] +commands = flake8 + +[testenv:venv] +commands = {posargs} + +[testenv:cover] +setenv = VIRTUAL_ENV={envdir} +commands = + nosetests {posargs} + +[flake8] +# F841 local variable 'json_template' is assigned to but never used +# H201 no 'except:' at least use 'except Exception:' +# H302 import only modules.'bla..' does not import a module +# H306 imports not in alphabetical order +# H404 multi line docstring should start with a summary +ignore = F841,H201,H302,H306,H404 +show-source = true +builtins = _ +exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,build