Skip to content

Commit 78ad53d

Browse files
committed
Update python versions to 2.7/3.4, Replace latex_paper_size
Sphinx requires python 2.7/3.4 or higher. Latex_paper_size property is deprecated, replace with latex_elements.papersize According to the latest failed builds, sphinx needs at least Python 2.7 or 3.4 to build.
1 parent 59a887a commit 78ad53d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: python
22
python:
3-
- 2.6
4-
- 3.3
3+
- 2.7
4+
- 3.4
55

66
before_install:
77
- sudo apt-get update -qq

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MAKEINFO := makeinfo
1717

1818
BUILDDIR := build
1919
SOURCE := src/
20-
PAPERSIZE := -D latex_paper_size=a4
20+
PAPERSIZE := -D latex_elements.papersize=a4
2121
SPHINXFLAGS := -a -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree
2222
SPHINXOPTS := $(SPHINXFLAGS) $(SOURCE)
2323

make.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ if "%SPHINXBUILD%" == "" (
77
)
88
set BUILDDIR=build
99
set SOURCE=src/
10-
set PAPERSIZE=-D latex_paper_size=a4
10+
set PAPERSIZE=-D latex_elements.papersize=a4
1111
set SPHINXFLAGS=-a -n -A local=1 %PAPERSIZE%
1212
set SPHINXOPTS=%SPHINXFLAGS% %SOURCE%
1313
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS%
1414
set I18NSPHINXOPTS=%SPHINXOPTS%
1515
if NOT "%PAPER%" == "" (
16-
set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
17-
set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
16+
set ALLSPHINXOPTS=-D latex_elements.papersize=%PAPER% %ALLSPHINXOPTS%
17+
set I18NSPHINXOPTS=-D latex_elements.papersize=%PAPER% %I18NSPHINXOPTS%
1818
)
1919

2020
if "%1" == "" goto help

0 commit comments

Comments
 (0)