summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-03-09 18:10:22 +0900
committerGitHub <noreply@github.com>2019-03-09 18:10:22 +0900
commit9f283bc3f1d6a7f9aacfaa377f0983d3709a0dc1 (patch)
treef9c5cbd99eda56870952c6dc9f3da301e445d516
parentf03c2d4fe22500e751a17a84d299cf5f0de901ee (diff)
parentf61a5f91f75556c3e886fbef7621acd77760bf51 (diff)
downloadsphinx-git-9f283bc3f1d6a7f9aacfaa377f0983d3709a0dc1.tar.gz
Merge pull request #6153 from tk0miya/use_bionic_on_circleci
Use bionic (py36) on Circle CI
-rw-r--r--.circleci/config.yml6
-rw-r--r--tests/roots/test-ext-imgconverter/svgimg.svg2
-rw-r--r--tests/roots/test-images/subdir/svgimg.svg2
-rw-r--r--tests/roots/test-images/subdir/svgimg.xx.svg2
-rw-r--r--tests/roots/test-root/svgimg.svg2
-rw-r--r--tests/roots/test-warnings/svgimg.svg2
6 files changed, 8 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d349db6e0..6ca62abb7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,6 @@ jobs:
working_directory: /sphinx
steps:
- checkout
- - run: /python3.5/bin/pip install -U pip setuptools
- - run: /python3.5/bin/pip install -U .[test,websupport]
- - run: make test PYTHON=/python3.5/bin/python
+ - run: /python3.6/bin/pip install -U pip setuptools
+ - run: /python3.6/bin/pip install -U .[test,websupport]
+ - run: make test PYTHON=/python3.6/bin/python
diff --git a/tests/roots/test-ext-imgconverter/svgimg.svg b/tests/roots/test-ext-imgconverter/svgimg.svg
index 533a9fa65..2bae0b9b9 100644
--- a/tests/roots/test-ext-imgconverter/svgimg.svg
+++ b/tests/roots/test-ext-imgconverter/svgimg.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="60" width="60">
<circle cx="40" cy="40" r="24" style="stroke:#000000; fill:#ffffff"/>
</svg>
diff --git a/tests/roots/test-images/subdir/svgimg.svg b/tests/roots/test-images/subdir/svgimg.svg
index 533a9fa65..2bae0b9b9 100644
--- a/tests/roots/test-images/subdir/svgimg.svg
+++ b/tests/roots/test-images/subdir/svgimg.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="60" width="60">
<circle cx="40" cy="40" r="24" style="stroke:#000000; fill:#ffffff"/>
</svg>
diff --git a/tests/roots/test-images/subdir/svgimg.xx.svg b/tests/roots/test-images/subdir/svgimg.xx.svg
index 533a9fa65..2bae0b9b9 100644
--- a/tests/roots/test-images/subdir/svgimg.xx.svg
+++ b/tests/roots/test-images/subdir/svgimg.xx.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="60" width="60">
<circle cx="40" cy="40" r="24" style="stroke:#000000; fill:#ffffff"/>
</svg>
diff --git a/tests/roots/test-root/svgimg.svg b/tests/roots/test-root/svgimg.svg
index 533a9fa65..2bae0b9b9 100644
--- a/tests/roots/test-root/svgimg.svg
+++ b/tests/roots/test-root/svgimg.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="60" width="60">
<circle cx="40" cy="40" r="24" style="stroke:#000000; fill:#ffffff"/>
</svg>
diff --git a/tests/roots/test-warnings/svgimg.svg b/tests/roots/test-warnings/svgimg.svg
index 533a9fa65..2bae0b9b9 100644
--- a/tests/roots/test-warnings/svgimg.svg
+++ b/tests/roots/test-warnings/svgimg.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="60" width="60">
<circle cx="40" cy="40" r="24" style="stroke:#000000; fill:#ffffff"/>
</svg>