Merge pull request #6153 from tk0miya/use_bionic_on_circleci

Use bionic (py36) on Circle CI
2025-02-25 18:55:22 -06:00 · 2019-03-09 18:10:22 +09:00 · 2019-03-09 18:10:22 +09:00 · 9f283bc3f1
commit 9f283bc3f1
parent f03c2d4fe2 f61a5f91f7
6 changed files with 8 additions and 8 deletions
--- 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.6/bin/pip install -U pip setuptools
-      - run: /python3.5/bin/pip install -U .[test,websupport]
+      - run: /python3.6/bin/pip install -U .[test,websupport]
-      - run: make test PYTHON=/python3.5/bin/python
+      - run: make test PYTHON=/python3.6/bin/python
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>