commit 4af3f84381ada737f06bfc176b88194b6969f45a Author: Isis Lovecruft isis@torproject.org Date: Fri Apr 19 23:49:15 2013 +0000

Removing faulting setup.py code. --- setup.py | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/setup.py b/setup.py index 64cce36..e474b0d 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,27 @@ from __future__ import with_statement from setuptools import setup, find_packages

-def get_requirements(): - with open('requirements.txt', 'r') as f: - requirements = f.read().splitlines() - - # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in - # requirements.txt we need to add the package name to install_requires and - # the entire url to dependency_links. That way setuptools will be able to - # satisfy the dependency using that url (as long as it is in standard sdist - # format, a single .py file or an egg). - pypi_packages = [] - dependency_links = [] - for package_desc in requirements: - if '#egg=' in package_desc: - dependency_links.append(package_desc) - pypi_packages.append(package_desc.split('#egg=')[-1]) - else: - pypi_packages.append(package_desc) - - return pypi_packages, dependency_links - -install_requires, dependency_links = get_requirements() +#def get_requirements(): +# with open('requirements.txt', 'r') as f: +# requirements = f.read().splitlines() +# +# # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in +# # requirements.txt we need to add the package name to install_requires and +# # the entire url to dependency_links. That way setuptools will be able to +# # satisfy the dependency using that url (as long as it is in standard sdist +# # format, a single .py file or an egg). +# pypi_packages = [] +# dependency_links = [] +# for package_desc in requirements: +# if '#egg=' in package_desc: +# dependency_links.append(package_desc) +# pypi_packages.append(package_desc.split('#egg=')[-1]) +# else: +# pypi_packages.append(package_desc) +# +# return pypi_packages, dependency_links +# +#install_requires, dependency_links = get_requirements() setup( name="oonib", version="0.9", @@ -31,6 +31,6 @@ setup( description="OONI-Probe Backend", scripts=["bin/oonib"], packages=find_packages(), - install_requires=install_requires, - dependency_links=dependency_links, + #install_requires=install_requires, + #dependency_links=dependency_links, )