From 79dffacf4e4ec63a4db8869c03aae33bbbbfa0b5 Mon Sep 17 00:00:00 2001 From: Lincoln de Sousa Date: Tue, 6 Nov 2012 18:02:10 -0500 Subject: Adding tox info (and a requirements file) --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 tox.ini (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..6cb80012 --- /dev/null +++ b/tox.ini @@ -0,0 +1,6 @@ +[tox] +envlist = py25,py26,py27 + +[testenv] +commands = pip install --use-mirrors -q -r requirements.txt + python test.py -- cgit v1.2.3 From 4ee577abc529603414836d9929f75fa8d67bbffb Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 26 Jun 2013 09:02:27 -0700 Subject: Move reqs.txt to dev-reqs.txt, solidify tox req --- dev-requirements.txt | 1 + requirements.txt | 2 -- tox.ini | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt (limited to 'tox.ini') diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 00000000..84c7697a --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1 @@ +tox>=1.4,<1.5 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a23..00000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/tox.ini b/tox.ini index 6cb80012..e2a8dcf4 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r dev-requirements.txt python test.py -- cgit v1.2.3 From 8edd2cc75e50a664ffb8370e0f7c26b78f9d9755 Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Wed, 30 Oct 2013 16:06:09 -0700 Subject: Add Py3.2 and Py3.3 to tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e2a8dcf4..c63c93d3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py25,py26,py27 +envlist = py25,py26,py27,py32,py33 [testenv] commands = pip install --use-mirrors -q -r dev-requirements.txt -- cgit v1.2.3 From 7d56ecb1a7d1654ae971e9896aa26e938454d3ea Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 10 Jan 2014 20:07:43 -0800 Subject: Meta prep work (reqs.txt, tasks.py) --- .gitignore | 1 + .travis.yml | 4 +++- dev-requirements.txt | 6 ++++++ requirements.txt | 2 -- site/dev-requirements.txt | 3 --- site/tasks.py | 19 ------------------- tasks.py | 20 ++++++++++++++++++++ tox-requirements.txt | 2 ++ tox.ini | 2 +- 9 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt delete mode 100644 site/dev-requirements.txt delete mode 100644 site/tasks.py create mode 100644 tasks.py create mode 100644 tox-requirements.txt (limited to 'tox.ini') diff --git a/.gitignore b/.gitignore index 4b578950..a125b270 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist/ paramiko.egg-info/ test.log docs/ +_build diff --git a/.travis.yml b/.travis.yml index c9802a80..29e44e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ python: install: # Self-install for setup.py-driven deps - pip install -e . - - pip install coveralls + # Dev (doc/test running) requirements + - pip install coveralls # For coveralls.io specifically + - pip install -r dev-requirements.txt script: coverage run --source=paramiko test.py --verbose notifications: irc: diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 00000000..59a1f144 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,6 @@ +# For newer tasks like building Sphinx docs. +# NOTE: Requires Python >=2.6 +invoke>=0.6.1 +invocations>=0.4.4 +sphinx>=1.1.3 +alabaster>=0.1.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a23..00000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/site/dev-requirements.txt b/site/dev-requirements.txt deleted file mode 100644 index 524b8060..00000000 --- a/site/dev-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -invoke>=0.6.1 -invocations>=0.4.4 -sphinx==1.1.3 diff --git a/site/tasks.py b/site/tasks.py deleted file mode 100644 index e2d952b1..00000000 --- a/site/tasks.py +++ /dev/null @@ -1,19 +0,0 @@ -from invoke import Collection -from invocations import docs, testing - -# TODO: let from_module specify new name -api = Collection.from_module(docs) -# TODO: maybe allow rolling configuration into it too heh -api.configure({ - 'sphinx.source': 'api', - 'sphinx.target': 'api/_build', -}) -api.name = 'api' -site = Collection.from_module(docs) -site.name = 'site' -site.configure({ - 'sphinx.source': 'site', - 'sphinx.target': 'site/_build', -}) - -ns = Collection(testing.test, api=api, site=site) diff --git a/tasks.py b/tasks.py new file mode 100644 index 00000000..d470dab0 --- /dev/null +++ b/tasks.py @@ -0,0 +1,20 @@ +from invoke import Collection +from invocations import docs, testing + + +# TODO: let from_module specify new name +api = Collection.from_module(docs) +# TODO: maybe allow rolling configuration into it too heh +api.configure({ + 'sphinx.source': 'api', + 'sphinx.target': 'api/_build', +}) +api.name = 'api' +site = Collection.from_module(docs) +site.name = 'site' +site.configure({ + 'sphinx.source': 'site', + 'sphinx.target': 'site/_build', +}) + +ns = Collection(testing.test, api=api, site=site) diff --git a/tox-requirements.txt b/tox-requirements.txt new file mode 100644 index 00000000..26224ce6 --- /dev/null +++ b/tox-requirements.txt @@ -0,0 +1,2 @@ +# Not sure why tox can't just read setup.py? +pycrypto diff --git a/tox.ini b/tox.ini index 6cb80012..af4fbf20 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r tox-requirements.txt python test.py -- cgit v1.2.3