diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-10 20:07:43 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-21 16:15:30 -0800 |
| commit | 7d56ecb1a7d1654ae971e9896aa26e938454d3ea (patch) | |
| tree | c85fd04be05e28cd0c06a4bc600b79256b77a22e | |
| parent | c74ff2a16e47bdf31f8ad17bbfbe2da5d03803c6 (diff) | |
Meta prep work (reqs.txt, tasks.py)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | dev-requirements.txt | 6 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | site/dev-requirements.txt | 3 | ||||
| -rw-r--r-- | tasks.py (renamed from site/tasks.py) | 1 | ||||
| -rw-r--r-- | tox-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
8 files changed, 14 insertions, 7 deletions
@@ -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/tasks.py index e2d952b1..d470dab0 100644 --- a/site/tasks.py +++ b/tasks.py @@ -1,6 +1,7 @@ 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 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 @@ -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 |