diff --git a/requirements.pip b/requirements.pip index 78032cb..56358cc 100644 --- a/requirements.pip +++ b/requirements.pip @@ -3,4 +3,4 @@ rdflib>=4.2.0 requests>=2.5.1 six>=1.10.0 setuptools>=18.5 -git+https://github.com/RDFLib/rdflib-sqlalchemy.git@20fbf1fbbdbc53917bfd7554f38d22d08e71e225 +git+https://github.com/RDFLib/rdflib-sqlalchemy.git@20fbf1fbbdbc53917bfd7554f38d22d08e71e225#egg=rdflib-sqlalchemy-0.2.dev1 diff --git a/setup.py b/setup.py index 07b08e9..9148a8f 100644 --- a/setup.py +++ b/setup.py @@ -13,16 +13,29 @@ def requirements_for(version=None): pip_path = 'requirements%s.pip' % suffix if not isfile(pip_path): - return set() + return set(), set() + requirements = set() + links = set() with open(pip_path) as pip_file: - requirements = set(line.strip() for line in pip_file) - return requirements - - -def install_requires(): - return requirements_for() | requirements_for(version_info.major) - + for line in pip_file: + line = line.strip() + if '#egg=' in line: + requirement_parts = line.split('#egg=')[-1].split('-') + version = requirement_parts[-1] + library = '-'.join(requirement_parts[:-1]) + requirement = '%s==%s' % (library, version) + requirements.add(requirement) + links.add(line) + else: + requirements.add(line) + return requirements, links + + +requirements_general, links_general = requirements_for() +requirements_version, links_version = requirements_for(version_info.major) +install_requires = requirements_general | requirements_version +dependency_links = links_general | links_version setup( name='Gutenberg', @@ -35,4 +48,5 @@ def install_requires(): license='LICENSE.txt', description='Library to interface with Project Gutenberg', long_description=open('README.rst').read(), - install_requires=install_requires()) + dependency_links=dependency_links, + install_requires=install_requires)