Merge branch 'trough-dedup' into qa

* trough-dedup:
  we depend on the requests library now in the main code, for trough dedup :-\
This commit is contained in:
Noah Levitt 2017-11-08 13:28:09 -08:00
commit 7b19daf112

View File

@ -41,6 +41,7 @@ deps = [
'urlcanon>=0.1.dev16', 'urlcanon>=0.1.dev16',
'doublethink>=0.2.0.dev87', 'doublethink>=0.2.0.dev87',
'urllib3', 'urllib3',
'requests>=2.0.1',
'PySocks', 'PySocks',
'cryptography!=2.1.1', # 2.1.1 installation is failing on ubuntu 'cryptography!=2.1.1', # 2.1.1 installation is failing on ubuntu
] ]
@ -60,7 +61,7 @@ setuptools.setup(
license='GPL', license='GPL',
packages=['warcprox'], packages=['warcprox'],
install_requires=deps, install_requires=deps,
tests_require=['requests>=2.0.1', 'mock', 'pytest', 'warcio'], # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636 tests_require=['mock', 'pytest', 'warcio'],
cmdclass = {'test': PyTest}, cmdclass = {'test': PyTest},
test_suite='warcprox.tests', test_suite='warcprox.tests',
entry_points={ entry_points={