Packaging - in setup.py, pull requirements from requirements files so we don't have the requirements declared in two places that will get out of sync.

dpoirier · dpoirier · commit 7e323d3756ae · 2012-10-01T09:01:49.000-04:00
Add docs, AUTHORS, LICENSE, README, requirements files to package.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 *~
 docs/_build
 *.egg-info
+*.egg
+dist
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include LICENSE AUTHORS README.rst requirements* docs/*
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 ## We're using the best maintained fork of python-oauth2
-https://github.com/dgouldin/python-oauth2/tarball/master
+https://github.com/dgouldin/python-oauth2/tarball/master#egg=oauth2
 requests==0.14.0
 python-dateutil==1.5
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,3 +1,4 @@
 -r requirements.txt
 
 Sphinx==1.1.3
+mock==0.8.0
diff --git a/setup.py b/setup.py
@@ -3,12 +3,11 @@
 
 import re
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
 
-required = ['requests==0.14.0', 'python-dateutil==1.5']
+required = [line for line in open('requirements.txt').read().split("\n") if not line.startswith("http")]
+dependency_links = [line for line in open('requirements.txt').read().split("\n") if line.startswith("http")]
+required_dev = [line for line in open('requirements_dev.txt').read().split("\n") if not line.startswith("-r")]
 fbinit = open('fitbit/__init__.py').read()
 author = re.search("__author__ = '([^']+)'", fbinit).group(1)
 version = re.search("__version__ = '([^']+)'", fbinit).group(1)
@@ -24,10 +23,11 @@
     packages=['fitbit'],
     package_data={'': ['LICENSE']},
     include_package_data=True,
-    install_requires=required,
+    install_requires=["distribute"] + required,
+    dependency_links=dependency_links,
     license='Apache 2.0',
     test_suite='tests.all_tests',
-    tests_require=['mock==0.8.0'],
+    tests_require=required_dev,
     classifiers=(
         'Intended Audience :: Developers',
         'Natural Language :: English',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+include LICENSE AUTHORS README.rst requirements* docs/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`-r requirements.txt`
`2`	`2`
`3`	`3`	`Sphinx==1.1.3`
	`4`	`+mock==0.8.0`