backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

make trough dependency optional

Browse Source
This commit is contained in:
Noah Levitt 2020-01-08 13:37:01 -08:00
parent a8cd53bfe4
commit 90fba01514
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -35,7 +35,6 @@ deps = [
'idna>=2.5', 'idna>=2.5',
'PyYAML>=5.1', 'PyYAML>=5.1',
'cachetools', 'cachetools',
'trough>=0.1.4',
] ]
try: try:
import concurrent.futures import concurrent.futures
@ -44,7 +43,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.4.25', version='2.4.26',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',
@ -53,6 +52,7 @@ setuptools.setup(
license='GPL', license='GPL',
packages=['warcprox'], packages=['warcprox'],
install_requires=deps, install_requires=deps,
extras_require={'trough': ['trough>=0.1.4',],},
setup_requires=['pytest-runner'], setup_requires=['pytest-runner'],
tests_require=['mock', 'pytest', 'warcio'], tests_require=['mock', 'pytest', 'warcio'],
entry_points={ entry_points={

9
warcprox/dedup.py
View File

@ -506,7 +506,14 @@ class TroughDedupDb(DedupDb, DedupableMixin):
'values (%s, %s, %s, %s);') 'values (%s, %s, %s, %s);')
def __init__(self, options=warcprox.Options()): def __init__(self, options=warcprox.Options()):
import trough.client try:
import trough.client
except ImportError as e:
logging.critical(
'%s: %s\n\nYou might need to run "pip install '
'warcprox[trough]".', type(e).__name__, e)
sys.exit(1)
DedupableMixin.__init__(self, options) DedupableMixin.__init__(self, options)
self.options = options self.options = options
self._trough_cli = trough.client.TroughClient( self._trough_cli = trough.client.TroughClient(