Skip to content

Commit

Permalink
Removed pip parse_requirments (#524)
Browse files Browse the repository at this point in the history
* Added Photorec task to Turbinia.

* Formatting fixes.

* Added photorec_test and made minor changes.

* Minor changes to photorec.py

* Minor changes to photorec

* Revert to initial command.

* Fixed some nits.

* Added Jupyter Notebook analysis task.

* Cleaned formmating

* Corrected formatting

* Fixed the comments/made small changes.

* Delete .gitignore

* Corrected formatting

* Added checks for job whitelist/blacklist

* Fixed formatting

* Fixed pip20.1 issue with internal imports

* removed unwanted files
  • Loading branch information
alimez authored May 8, 2020
1 parent 052665a commit b8b2faf
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
from setuptools import find_packages
from setuptools import setup

try: # for pip >= 10
from pip._internal.req import parse_requirements
except ImportError: # for pip <= 9.0.3
from pip.req import parse_requirements


# make sure turbinia is in path
sys.path.insert(0, '.')
Expand All @@ -44,6 +39,9 @@
'large amounts of evidence, and decreasing response time by parallelizing'
'processing where possible.')

requirements = []
with open('requirements.txt','r') as f:
requirements = f.read().splitlines()
setup(
name='turbinia',
version=turbinia.__version__,
Expand All @@ -63,9 +61,7 @@
include_package_data=True,
zip_safe=False,
entry_points={'console_scripts': ['turbiniactl=turbinia.turbiniactl:main']},
install_requires=[str(req.req) for req in parse_requirements(
'requirements.txt', session=False)
],
install_requires=requirements,
extras_require={
'dev': ['mock', 'nose', 'yapf', 'celery~=4.1', 'coverage'],
'local': ['celery~=4.1', 'kombu~=4.1', 'redis~=3.0'],
Expand Down

0 comments on commit b8b2faf

Please sign in to comment.