mirror of
https://github.com/internetarchive/warcprox.git
synced 2025-01-18 13:22:09 +01:00
clean up test infrastructure
- fix crufty, broken test in setup.py - include tests in sdist tarball for pypi
This commit is contained in:
parent
688e53d889
commit
b2a1f15bf6
1
MANIFEST.in
Normal file
1
MANIFEST.in
Normal file
@ -0,0 +1 @@
|
|||||||
|
recursive-include tests *.py *.sh Dockerfile
|
6
setup.cfg
Normal file
6
setup.cfg
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[aliases]
|
||||||
|
test=pytest
|
||||||
|
|
||||||
|
[tool:pytest]
|
||||||
|
addopts=-v
|
||||||
|
testpaths=tests
|
19
setup.py
19
setup.py
@ -2,7 +2,7 @@
|
|||||||
'''
|
'''
|
||||||
setup.py - setuptools installation configuration for warcprox
|
setup.py - setuptools installation configuration for warcprox
|
||||||
|
|
||||||
Copyright (C) 2013-2016 Internet Archive
|
Copyright (C) 2013-2018 Internet Archive
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
@ -22,18 +22,6 @@ USA.
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
import setuptools
|
import setuptools
|
||||||
import setuptools.command.test
|
|
||||||
|
|
||||||
class PyTest(setuptools.command.test.test):
|
|
||||||
def finalize_options(self):
|
|
||||||
setuptools.command.test.test.finalize_options(self)
|
|
||||||
self.test_args = []
|
|
||||||
self.test_suite = True
|
|
||||||
def run_tests(self):
|
|
||||||
# import here, because outside the eggs aren't loaded
|
|
||||||
import pytest
|
|
||||||
errno = pytest.main(self.test_args)
|
|
||||||
sys.exit(errno)
|
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
'certauth==1.1.6',
|
'certauth==1.1.6',
|
||||||
@ -52,7 +40,7 @@ except:
|
|||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='warcprox',
|
name='warcprox',
|
||||||
version='2.4b2.dev147',
|
version='2.4b2.dev148',
|
||||||
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',
|
||||||
@ -61,9 +49,8 @@ setuptools.setup(
|
|||||||
license='GPL',
|
license='GPL',
|
||||||
packages=['warcprox'],
|
packages=['warcprox'],
|
||||||
install_requires=deps,
|
install_requires=deps,
|
||||||
|
setup_requires=['pytest-runner'],
|
||||||
tests_require=['mock', 'pytest', 'warcio'],
|
tests_require=['mock', 'pytest', 'warcio'],
|
||||||
cmdclass = {'test': PyTest},
|
|
||||||
test_suite='warcprox.tests',
|
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'warcprox=warcprox.main:main',
|
'warcprox=warcprox.main:main',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user