mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
Update Tox config and fix failing CI envs
Updates Python version for flake8 and docs Tox envs from 2.7 to 3.7. Fixes a failing test and a linting error.
This commit is contained in:
parent
8ed686136a
commit
c01bc6eea5
4 changed files with 12 additions and 12 deletions
|
|
@ -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=py37
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- python: 3.6
|
- python: 3.6
|
||||||
|
|
|
||||||
|
|
@ -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()
|
||||||
|
|
|
||||||
|
|
@ -485,20 +485,20 @@ class MdReaderTest(ReaderTest):
|
||||||
_path('article_with_markdown_and_footnote.md'))
|
_path('article_with_markdown_and_footnote.md'))
|
||||||
expected_content = (
|
expected_content = (
|
||||||
'<p>This is some content'
|
'<p>This is some content'
|
||||||
'<sup id="fnref-1"><a class="footnote-ref" href="#fn-1"'
|
'<sup id="fnref:1"><a class="footnote-ref" href="#fn:1"'
|
||||||
'>1</a></sup>'
|
'>1</a></sup>'
|
||||||
' with some footnotes'
|
' with some footnotes'
|
||||||
'<sup id="fnref-footnote"><a class="footnote-ref" '
|
'<sup id="fnref:footnote"><a class="footnote-ref" '
|
||||||
'href="#fn-footnote">2</a></sup></p>\n'
|
'href="#fn:footnote">2</a></sup></p>\n'
|
||||||
|
|
||||||
'<div class="footnote">\n'
|
'<div class="footnote">\n'
|
||||||
'<hr>\n<ol>\n<li id="fn-1">\n'
|
'<hr>\n<ol>\n<li id="fn:1">\n'
|
||||||
'<p>Numbered footnote '
|
'<p>Numbered footnote '
|
||||||
'<a class="footnote-backref" href="#fnref-1" '
|
'<a class="footnote-backref" href="#fnref:1" '
|
||||||
'title="Jump back to footnote 1 in the text">↩</a></p>\n'
|
'title="Jump back to footnote 1 in the text">↩</a></p>\n'
|
||||||
'</li>\n<li id="fn-footnote">\n'
|
'</li>\n<li id="fn:footnote">\n'
|
||||||
'<p>Named footnote '
|
'<p>Named footnote '
|
||||||
'<a class="footnote-backref" href="#fnref-footnote"'
|
'<a class="footnote-backref" href="#fnref:footnote"'
|
||||||
' title="Jump back to footnote 2 in the text">↩</a></p>\n'
|
' title="Jump back to footnote 2 in the text">↩</a></p>\n'
|
||||||
'</li>\n</ol>\n</div>')
|
'</li>\n</ol>\n</div>')
|
||||||
expected_metadata = {
|
expected_metadata = {
|
||||||
|
|
|
||||||
4
tox.ini
4
tox.ini
|
|
@ -22,7 +22,7 @@ commands =
|
||||||
- coveralls
|
- coveralls
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python2.7
|
basepython = python3.7
|
||||||
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.7
|
||||||
deps =
|
deps =
|
||||||
-rrequirements/style.pip
|
-rrequirements/style.pip
|
||||||
commands =
|
commands =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue