From a20a5f613127528eedbee66f4ece777c2ed17d2b Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sat, 23 Dec 2023 12:37:46 -0500 Subject: [PATCH 1/2] Restore Python 2.7 tests --- .github/workflows/tests.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7919744..2c0d26c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,12 +13,12 @@ jobs: os: ["ubuntu-latest", "windows-latest", "macos-latest"] exclude: - python-version: "2.7" - os: "ubuntu-latest" + os: "windows-latest" + - python-version: "2.7" + os: "macos-latest" - python-version: "3.6" os: "ubuntu-latest" include: - - python-version: "2.7" - os: "ubuntu-20.04" - python-version: "3.6" os: "ubuntu-20.04" env: @@ -26,7 +26,13 @@ jobs: steps: - uses: actions/checkout@v3 - - name: ${{ matrix.python-version }} - ${{ matrix.os }} + - if: ${{ matrix.python-version == '2.7' }} + run: | + sudo apt-get install python-is-python2 + curl -sSL https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py + python get-pip.py + - if: ${{ matrix.python-version != '2.7' }} + name: ${{ matrix.python-version }} - ${{ matrix.os }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} From 5bd6efe5113c92d0beab1a3f6d2cfb61e90cf1ef Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sat, 23 Dec 2023 12:40:59 -0500 Subject: [PATCH 2/2] Fix readthedocs build --- .github/workflows/tests.yml | 4 ++++ .readthedocs.yml | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c0d26c..8fb3587 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,9 +16,13 @@ jobs: os: "windows-latest" - python-version: "2.7" os: "macos-latest" + - python-version: "2.7" + os: "ubuntu-latest" - python-version: "3.6" os: "ubuntu-latest" include: + - python-version: "2.7" + os: "ubuntu-20.04" - python-version: "3.6" os: "ubuntu-20.04" env: diff --git a/.readthedocs.yml b/.readthedocs.yml index 8d95674..2dc5f20 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,7 +1,15 @@ version: 2 # Required in order to install with pip +build: + os: "ubuntu-22.04" + tools: + python: "3.11" + +sphinx: + configuration: "docs/conf.py" + python: - version: 3.7 install: - - path: . + - method: "pip" + path: "." - requirements: docs/requirements.txt