From 23724d538b3fd5f71b5223b041a9444454588bde Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Tue, 13 Sep 2022 15:01:10 -0300 Subject: [PATCH 1/2] rename to main --- .github/workflows/deploy-docs.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/tarball-tests.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 539d237..0002cc1 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -3,7 +3,7 @@ name: Build and Deploy docs on: pull_request: push: - branches: [master] + branches: [main] jobs: run: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9a86e1f..1c98405 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,7 +3,7 @@ name: pre-commit on: pull_request: push: - branches: [master] + branches: [main] jobs: pre-commit: diff --git a/.github/workflows/tarball-tests.yml b/.github/workflows/tarball-tests.yml index b8d8fab..7d31e5b 100644 --- a/.github/workflows/tarball-tests.yml +++ b/.github/workflows/tarball-tests.yml @@ -3,7 +3,7 @@ name: Tarball tests on: pull_request: push: - branches: [master] + branches: [main] jobs: run: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b9ba7de..7230b7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Tests on: pull_request: push: - branches: [master] + branches: [main] jobs: run: From 7f7300e87e8c567dbae612d4790e9686aa7ded17 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Tue, 13 Sep 2022 15:01:17 -0300 Subject: [PATCH 2/2] remove unsed CI --- .appveyor.yml | 54 --------------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 329bb40..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,54 +0,0 @@ -environment: - matrix: - - TARGET_ARCH: x64 - CONDA_PY: 3.6 - CONDA_NPY: 1.11 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x64 - CONDA_PY: 3.6 - CONDA_NPY: 1.17 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x64 - CONDA_PY: 3.8 - CONDA_NPY: 1.19 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 - - - TARGET_ARCH: x64 - CONDA_PY: 3.8 - CONDA_NPY: 1.19 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 - -platform: - - x64 - -install: - # If there is a newer build queued for the same PR, cancel this one. - # The AppVeyor 'rollout builds' option is supposed to serve the same - # purpose but it is problematic because it tends to cancel builds pushed - # directly to master instead of just PR builds (or the converse). - - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } - - # Add path, activate `conda` and update conda. - - cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%" - - cmd: conda config --set always_yes yes --set changeps1 no --set show_channel_urls true - - cmd: conda update conda - - cmd: conda config --add channels conda-forge --force - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - - cmd: set PYTHONUNBUFFERED=1 - - - cmd: conda create --name TEST python=%CONDA_PY% numpy=%CONDA_NPY% pytest pip - - cmd: conda info --all - - cmd: activate TEST - -# Skip .NET project specific build phase. -build: off - -test_script: - - pip install -e . - - cd gsw && pytest -s -rxs -v tests