From 0be43408d739b47fe54de9bcf07ff52a245d8367 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Sun, 5 Jul 2020 09:40:45 +0200 Subject: [PATCH 1/2] Update CI scripts with new Sphinx versions --- .github/workflows/unit_tests.yml | 7 ++++--- .travis.yml | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index f2564b8b..6e3b8f99 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -8,9 +8,10 @@ jobs: matrix: python-version: [3.5, 3.6, 3.7, 3.8] sphinx-version: - - 3.0.0 - - 3.1.0 - - git+https://github.com/sphinx-doc/sphinx.git@3.1.x + - 3.0.4 + - 3.1.2 + - 3.2.0 + - git+https://github.com/sphinx-doc/sphinx.git@3.2.x - git+https://github.com/sphinx-doc/sphinx.git@3.x # master (Sphinx 4) will require at least Python 3.6, so disable it for now #- git+https://github.com/sphinx-doc/sphinx.git@master diff --git a/.travis.yml b/.travis.yml index d90bfff9..185b24d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ language: python env: - - SPHINX_VERSION=3.0 TRAVIS_CI=True + - SPHINX_VERSION=3.2 TRAVIS_CI=True python: - "3.5" - "3.6" + - "3.7" + - "3.8" before_install: - sudo apt-get update -qq From b1d41aa185ab2a817c3d76764bf75beccaf6fd42 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Sat, 8 Aug 2020 16:14:14 +0200 Subject: [PATCH 2/2] Remove Travis tests, covered by Workflows anyway --- .travis.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 185b24d6..00000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: python - -env: - - SPHINX_VERSION=3.2 TRAVIS_CI=True - -python: - - "3.5" - - "3.6" - - "3.7" - - "3.8" - -before_install: - - sudo apt-get update -qq - - sudo apt-get install -y doxygen texlive-latex-base texlive-latex-extra texlive-fonts-recommended latexmk - -install: - - pip install flake8 - - pip install pytest - - pip install Sphinx==$SPHINX_VERSION - - pip install . - -# Builds all examples & html documentation -# -# Provide definition for DOXYGEN variable to stop it trying -# to run `which doxygen` -script: - - make DOXYGEN=doxygen DEBUG="" - - make test - - make flake8