[Pkg-privacy-commits] [txtorcon] 37/96: install GeoIP headers instead

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository txtorcon.

commit b0152dded4a7d8e227d7f775f4056e27430f92fd
Author: meejah <meejah at meejah.ca>
Date:   Sat Jan 17 02:16:21 2015 -0700

    install GeoIP headers instead
---
 .travis.yml           |  2 +-
 dev-requirements.txt  |  3 +++
 test-requirements.txt | 12 ------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 423046a..96b58ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "pypy"
   - "2.7"
 # command to install dependencies
-install: "sudo apt-get install -y libgeoip-dev && pip install -r requirements.txt && pip install -r test-requirements.txt"
+install: "sudo apt-get install -y libgeoip-dev && pip install -r requirements.txt && pip install -r dev-requirements.txt"
 # command to run tests
 script:
     make coverage
diff --git a/dev-requirements.txt b/dev-requirements.txt
index cab9e2d..8ea4bab 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -7,3 +7,6 @@ twine
 pyflakes
 pep8
 mock
+# these are optional for users, but for testing we need them
+ipaddr
+GeoIP
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 8ea4bab..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-setuptools>=0.8.0
-Sphinx
-repoze.sphinx.autointerface>=0.4
-coveralls
-wheel
-twine
-pyflakes
-pep8
-mock
-# these are optional for users, but for testing we need them
-ipaddr
-GeoIP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git