From 9e2e226a36695444154fb9821f9a497d758196a0 Mon Sep 17 00:00:00 2001 From: David Huard Date: Wed, 13 Mar 2024 11:13:32 -0400 Subject: [PATCH 1/5] Removed Travis CI configuration --- .travis.yml | 81 ----------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b844ddc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ -## NOTE: travis CI is currently not used. We use github actions instead. -## See: .github/workflows/main.yml - -dist: xenial # required for Python >= 3.7 - -language: generic - -branches: - only: - - master - -matrix: - fast_finish: true - include: - - os: osx - python: "3.6" - name: "macOS (Python3.6)" - addons: - homebrew: - packages: - - pandoc - update: true - env: - - CONDA_FN="Miniconda3-latest-MacOSX-x86_64.sh" - - PEP8=false - - DOCS=false - - PYTHON_DESIRED=3.6 - - os: linux - name: "Linux (Python3.6 + pep8)" - python: "3.6" - addons: - apt: - packages: - - pandoc - update: true - env: - - CONDA_FN="Miniconda3-latest-Linux-x86_64.sh" - - PEP8=true - - DOCS=false - - PYTHON_DESIRED=3.6 - - os: linux - name: "Linux (Python3.7 + docs)" - python: "3.7" - addons: - apt: - packages: - - pandoc - update: true - env: - - CONDA_FN="Miniconda3-latest-Linux-x86_64.sh" - - PEP8=false - - DOCS=true - - PYTHON_DESIRED=3.7 - -sudo: false -before_install: - # Python 3.x is default - - wget "https://repo.continuum.io/miniconda/$CONDA_FN" -O miniconda.sh - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - # Useful for debugging any issues with conda - - conda info -a - # Prepare env with Python version - - conda create -n birdy python=$PYTHON_DESIRED -install: - # Update now the env with our environment - - conda env update -f environment.yml - - if [[ $DOCS == true ]]; then conda env update -f environment-docs.yml; fi - - source activate birdy - # Packages for testing - - conda install pytest pytest-notebook flake8 - # Install Emu WPS - - python setup.py install -script: - - make test - # - make test-nb - - if [[ $PEP8 == true ]]; then flake8 birdy tests; fi - - if [[ $DOCS == true ]]; then make docs; fi From bd9c8573e794d35b78c0aebe840f1c697da3ad53 Mon Sep 17 00:00:00 2001 From: David Huard Date: Wed, 13 Mar 2024 11:13:50 -0400 Subject: [PATCH 2/5] Removed 3.7 and 3.8 from the test suite --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3086413..45b311c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: pip install black - name: Check formatting with black ⚙️ run: | - black --check --target-version py37 birdy tests + black --check --target-version py39 birdy tests build: name: Testing with Python${{ matrix.python-version }} @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v4 - name: Install packages From ae0f3fe8e0fe8c1243717e30ef8d3f00ce1d223c Mon Sep 17 00:00:00 2001 From: David Huard Date: Wed, 13 Mar 2024 11:17:05 -0400 Subject: [PATCH 3/5] Update RtD python version to 3.9 --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 11b086d..00ae5db 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,7 +12,7 @@ sphinx: formats: all python: - version: 3.6 + version: 3.9 conda: environment: environment-docs.yml From 170e635c2f84953093a675d3030a99d7e68183c7 Mon Sep 17 00:00:00 2001 From: David Huard Date: Wed, 13 Mar 2024 11:30:56 -0400 Subject: [PATCH 4/5] Setting build.os config in RtD --- .readthedocs.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 00ae5db..a3cc553 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,11 +8,17 @@ version: 2 sphinx: configuration: docs/source/conf.py + +build: + os: ubuntu-22.04 + tools: + python: "mambaforge-22.9" + # Optionally build your docs in additional formats such as PDF and ePub formats: all python: - version: 3.9 + version: "3.9" conda: environment: environment-docs.yml From fc41bcd0585cce7a695f349572e958cbcc62bb7b Mon Sep 17 00:00:00 2001 From: David Huard Date: Wed, 13 Mar 2024 11:54:14 -0400 Subject: [PATCH 5/5] remove python.version from RtD --- .readthedocs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index a3cc553..5d2589c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,7 +8,6 @@ version: 2 sphinx: configuration: docs/source/conf.py - build: os: ubuntu-22.04 tools: @@ -17,8 +16,5 @@ build: # Optionally build your docs in additional formats such as PDF and ePub formats: all -python: - version: "3.9" - conda: environment: environment-docs.yml