From ed7abee5adcc52bc0fa827335b91f82eb4a02ad5 Mon Sep 17 00:00:00 2001 From: Nathan Ostgard Date: Wed, 13 Jan 2016 09:48:59 -0800 Subject: [PATCH 1/5] gh-76 Split up general requirements and documentation requirements --- docs/requirements.txt | 8 ++------ requirements.txt | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt index 8b44d9f..ce91885 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,2 @@ -LatLon -docopt -requests -mock -send2trash -sphinx +-r ../requirements.txt +sphinx>=1.3.4,<2.0 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..45baa63 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +docopt>=0.6.2,<1.0 +LatLon>=1.0.2,<2.0 +mock>=1.3.0,<2.0 +nose>=1.3.7,<2.0 +requests>=2.9.1,<3.0 +send2trash>=1.3.0,<2.0 From ab1bf88cddd0fb209b2e11902cc482884b84dd83 Mon Sep 17 00:00:00 2001 From: Nathan Ostgard Date: Wed, 13 Jan 2016 11:03:27 -0800 Subject: [PATCH 2/5] gh-76 Updated readme's pip install instructions --- Readme.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Readme.md b/Readme.md index b79303f..2b7a8b4 100644 --- a/Readme.md +++ b/Readme.md @@ -173,10 +173,7 @@ git clone https://github.com/jmathai/elodie.git The commands on this page assume you're running them from the root of this repository. I don't have any submodules but you'll need to install the following packages. ``` -pip install LatLon -pip install requests -pip install docopt -pip install send2trash +pip install -r requirements.txt ``` You'll need to install *exiftool* *pyexiv2* using `homebrew` on OSX. If you're running another operating system you're sort of on your own but my pal Google should be able to help. Some folks may be able to simply run these commands. Installing *boost* is a drag and can take up to 30 minutes. Don't say I didn't warn you. From c951dab095ebb72c1c0e2f3f07f25bdca1521afa Mon Sep 17 00:00:00 2001 From: Nathan Ostgard Date: Wed, 13 Jan 2016 11:07:19 -0800 Subject: [PATCH 3/5] gh-76 Updated .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 098fa3d..5e28f8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - "sudo apt-get update -qq" - "sudo apt-get install python-dev python-pip python-pyexiv2 libimage-exiftool-perl -y" install: - - "sudo pip install docopt LatLon mock nose requests send2trash" + - "sudo pip install -r requirements.txt" # command to run tests # test mapquest key before_script: From 718d8c130629faeae64df70ce4567d431aff9648 Mon Sep 17 00:00:00 2001 From: Nathan Ostgard Date: Sun, 17 Jan 2016 23:58:27 -0800 Subject: [PATCH 4/5] gh-76 Split up general requirements and test requirements --- .travis.yml | 2 +- elodie/tests/requirements.txt | 3 +++ requirements.txt | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 elodie/tests/requirements.txt diff --git a/.travis.yml b/.travis.yml index 5e28f8b..38d5530 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - "sudo apt-get update -qq" - "sudo apt-get install python-dev python-pip python-pyexiv2 libimage-exiftool-perl -y" install: - - "sudo pip install -r requirements.txt" + - "sudo pip install -r elodie/tests/requirements.txt" # command to run tests # test mapquest key before_script: diff --git a/elodie/tests/requirements.txt b/elodie/tests/requirements.txt new file mode 100644 index 0000000..0964c1c --- /dev/null +++ b/elodie/tests/requirements.txt @@ -0,0 +1,3 @@ +-r ../../requirements.txt +mock>=1.3.0,<2.0 +nose>=1.3.7,<2.0 diff --git a/requirements.txt b/requirements.txt index 45baa63..0e57c34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ docopt>=0.6.2,<1.0 LatLon>=1.0.2,<2.0 -mock>=1.3.0,<2.0 -nose>=1.3.7,<2.0 requests>=2.9.1,<3.0 send2trash>=1.3.0,<2.0 From 7eaacf73724d3437ff079026967087ff4a292a96 Mon Sep 17 00:00:00 2001 From: Nathan Ostgard Date: Tue, 19 Jan 2016 10:11:34 -0800 Subject: [PATCH 5/5] gh-76 Added mock module to docs/requirements.txt --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index ce91885..4164cd9 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,3 @@ -r ../requirements.txt +mock>=1.3.0,<2.0 sphinx>=1.3.4,<2.0