github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2571 from johnfraney/tox-python-versions

Browse source 
Update CI config and fix failing CI envs
This commit is contained in:
Justin Mayer 2019-06-19 09:40:07 +02:00 • committed by GitHub
commit 86777b9ce8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -1,11 +1,11 @@
language: python language: python
python: python:
- "3.5" - "3.6"
env: env:
- TOX_ENV=docs - TOX_ENV=docs
- TOX_ENV=flake8 - TOX_ENV=flake8
- TOX_ENV=py27 - TOX_ENV=py27
- TOX_ENV=py35 - TOX_ENV=py36
matrix: matrix:
include: include:
- python: 3.6 - python: 3.6

2
pelican/server.py
View file

@ -138,6 +138,6 @@ if __name__ == '__main__':
args.port, args.server) args.port, args.server)
try: try:
httpd.serve_forever() httpd.serve_forever()
except KeyboardInterrupt as e: except KeyboardInterrupt:
logger.info("Shutting down server.") logger.info("Shutting down server.")
httpd.socket.close() httpd.socket.close()

4
tox.ini
View file

@ -22,7 +22,7 @@ commands =
- coveralls - coveralls
[testenv:docs] [testenv:docs]
basepython = python2.7 basepython = python3.6
deps = deps =
-rrequirements/docs.pip -rrequirements/docs.pip
changedir = docs changedir = docs
@ -34,7 +34,7 @@ application-import-names = pelican
import-order-style = cryptography import-order-style = cryptography
[testenv:flake8] [testenv:flake8]
basepython = python2.7 basepython = python3.6
deps = deps =
-rrequirements/style.pip -rrequirements/style.pip
commands = commands =