OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed pytest not working with python 2.7. So turning travis tests back on for that version of python.

This commit is contained in:
Davis King 2019-02-20 08:30:38 -05:00
parent 23c140d138
commit 23f874d6e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -91,7 +91,7 @@ matrix:
################### ###################
- language: python - language: python
python: 3.5 python: 2.7
env: env:
- VARIANT=python-api - VARIANT=python-api
script: script:
@ -99,7 +99,7 @@ matrix:
################### ###################
- language: python - language: python
python: 3.7 python: 3.5
env: env:
- VARIANT=python-api - VARIANT=python-api
script: script:

3
setup.py
View File

@ -230,7 +230,8 @@ setup(
ext_modules=[CMakeExtension('dlib','tools/python')], ext_modules=[CMakeExtension('dlib','tools/python')],
cmdclass=dict(build_ext=CMakeBuild, test=PyTest), cmdclass=dict(build_ext=CMakeBuild, test=PyTest),
zip_safe=False, zip_safe=False,
tests_require=['pytest==3.8'], # We need an older more-itertools version because v6 broke pytest (for everyone, not just dlib)
tests_require=['pytest==3.8', 'more-itertools<6.0.0'],
#install_requires=['cmake'], # removed because the pip cmake package is busted, maybe someday it will be usable. #install_requires=['cmake'], # removed because the pip cmake package is busted, maybe someday it will be usable.
packages=['dlib'], packages=['dlib'],
keywords=['dlib', 'Computer Vision', 'Machine Learning'], keywords=['dlib', 'Computer Vision', 'Machine Learning'],