From 4d09af14aef9d7a6ca0aa98723caecd15e35abc6 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 11 Jul 2023 10:33:56 +0200 Subject: [PATCH 1/2] remove travis files --- .travis.yml | 47 ------------------------- environment.yaml | 2 +- test/test_preparation_and_conversion.py | 4 +-- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b83efa40..00000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-FileCopyrightText: 2021 The Atlite Authors -# -# SPDX-License-Identifier: CC0-1.0 - -language: bash -sudo: false # Use container-based infrastructure - -os: -- windows -- linux -- osx - -before_install: -- wget https://raw.githubusercontent.com/trichter/conda4travis/latest/conda4travis.sh -O conda4travis.sh -- source conda4travis.sh - -install: -- conda config --add channels conda-forge -- conda config --set channel_priority strict -- conda install -c conda-forge mamba -- mamba env create -f environment.yaml -- conda activate atlite - # - conda install -q -c conda-forge python-coveralls # don't install on appveyor -- pip install --no-cache-dir . - -# before_script: # configure a headless display to test plot generation -# - "export DISPLAY=:99.0" -# - "sh -e /etc/init.d/xvfb start" -# - sleep 3 # give xvfb some time to start - -before_script: -- 'echo -ne "url: ${CDSAPI_URL}\nkey: ${CDSAPI_TOKEN}\n" > ~/.cdsapirc' - -script: -- py.test - -# deploy new tags to pypi automatically -deploy: - provider: pypi - username: __token__ - # the token is set as the env var PYPI_PASSWORD on travis - edge: true # opt in to dpl v2 - distributions: "sdist bdist_wheel" - skip_existing: true - on: - tags: true - condition: $TRAVIS_OS_NAME = linux # pypi deploy is broken on windows diff --git a/environment.yaml b/environment.yaml index c835a06b..ad1bbfbd 100644 --- a/environment.yaml +++ b/environment.yaml @@ -35,6 +35,6 @@ dependencies: - bottleneck - numexpr - # For travis and testing + # For testing - pip - pytest diff --git a/test/test_preparation_and_conversion.py b/test/test_preparation_and_conversion.py index 5afec80c..55cf4c3c 100644 --- a/test/test_preparation_and_conversion.py +++ b/test/test_preparation_and_conversion.py @@ -531,7 +531,7 @@ def test_all_non_na_era5_coarse(cutout_era5_coarse): @staticmethod @pytest.mark.skipif( os.name == "nt", - reason="This test breaks on windows machine on travis" + reason="This test breaks on windows machine on CI" " due to unknown reasons.", ) def test_all_non_na_era5_weird_resolution(cutout_era5_weird_resolution): @@ -563,7 +563,7 @@ def test_dx_dy_preservation_era5_coarse(cutout_era5_coarse): @staticmethod @pytest.mark.skipif( os.name == "nt", - reason="This test breaks on windows machine on travis" + reason="This test breaks on windows machine on CI" " due to unknown reasons.", ) def test_dx_dy_preservation_era5_weird_resolution(cutout_era5_weird_resolution): From 88dab3513a9a0b0a2a4bb43e9cc0a3cb9228d8c1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 08:34:26 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- test/test_preparation_and_conversion.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/test_preparation_and_conversion.py b/test/test_preparation_and_conversion.py index 55cf4c3c..c8a5ecdb 100644 --- a/test/test_preparation_and_conversion.py +++ b/test/test_preparation_and_conversion.py @@ -531,8 +531,7 @@ def test_all_non_na_era5_coarse(cutout_era5_coarse): @staticmethod @pytest.mark.skipif( os.name == "nt", - reason="This test breaks on windows machine on CI" - " due to unknown reasons.", + reason="This test breaks on windows machine on CI" " due to unknown reasons.", ) def test_all_non_na_era5_weird_resolution(cutout_era5_weird_resolution): """ @@ -563,8 +562,7 @@ def test_dx_dy_preservation_era5_coarse(cutout_era5_coarse): @staticmethod @pytest.mark.skipif( os.name == "nt", - reason="This test breaks on windows machine on CI" - " due to unknown reasons.", + reason="This test breaks on windows machine on CI" " due to unknown reasons.", ) def test_dx_dy_preservation_era5_weird_resolution(cutout_era5_weird_resolution): """