From 87e89026068ae27d2f6b304df498d5851b6cd971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 19:16:33 +0200 Subject: [PATCH 1/7] Print python version on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 414b77b015..57be403cc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ before_install: install: - conda env create --file environment.yml - conda activate lst-dev + - python --version - | pip install \ https://github.com/cta-observatory/ctapipe/archive/$CTAPIPE_VERSION.tar.gz \ From 545cb048e91ca89f394aa08fb45ccb0032df639c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 19:21:36 +0200 Subject: [PATCH 2/7] Make sure the correct python versions are installed on travis --- .travis.yml | 1 + environment.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 57be403cc9..92786fc98b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_install: - conda info -a # Useful for debugging any issues with conda install: + - sed -i -e "s/- python=.*/python=$TRAVIS_PYTHON_VERSION/g" environment.yaml - conda env create --file environment.yml - conda activate lst-dev - python --version diff --git a/environment.yml b/environment.yml index ae5e943d06..70b789f11d 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,7 @@ channels: - cta-observatory - conda-forge dependencies: + - python=3.7 - pip - ctapipe=0.7.0 - gammapy>=0.17 From 649ba8eddf315ca369c77afe1a47d24ca8359d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 19:33:13 +0200 Subject: [PATCH 3/7] Fix filename in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92786fc98b..af3f9e2a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_install: - conda info -a # Useful for debugging any issues with conda install: - - sed -i -e "s/- python=.*/python=$TRAVIS_PYTHON_VERSION/g" environment.yaml + - sed -i -e "s/- python=.*/python=$TRAVIS_PYTHON_VERSION/g" environment.yml - conda env create --file environment.yml - conda activate lst-dev - python --version From aa692351dec31044748ff2d48b65875a6d66055b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 19:38:01 +0200 Subject: [PATCH 4/7] Fix sed call in travis config --- .travis.yml | 2 +- environment.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af3f9e2a19..fdc1964551 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_install: - conda info -a # Useful for debugging any issues with conda install: - - sed -i -e "s/- python=.*/python=$TRAVIS_PYTHON_VERSION/g" environment.yml + - sed -i -e "s/- python=.*/- python=$TRAVIS_PYTHON_VERSION/g" environment.yml - conda env create --file environment.yml - conda activate lst-dev - python --version diff --git a/environment.yml b/environment.yml index ce77dde81e..50a9bb2190 100644 --- a/environment.yml +++ b/environment.yml @@ -13,4 +13,3 @@ dependencies: - pytest_runner - pytest-ordering - git+git://github.com/cta-observatory/ctapipe_io_lst@v0.4.1 - From 7a36608273cbcb0af0df19dbed5c760405173f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 19:44:13 +0200 Subject: [PATCH 5/7] Force color output on travis --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdc1964551..4bbf77bdcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,13 @@ --- language: python +env: + global: + - PYTHONIOENCODING=UTF8 + - MPLBACKEND=Agg + - PYTEST_ADDOPTS='--color=yes' + + python: - 3.6 - 3.7 @@ -15,11 +22,6 @@ matrix: before_install: - # Use utf8 encoding. Should be default, but this is insurance - # against future changes - - export PYTHONIOENCODING=UTF8 - - export MPLBACKEND=Agg - - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - bash miniconda.sh -b -p $HOME/miniconda - . $HOME/miniconda/etc/profile.d/conda.sh From e64f4f8ffc3dba09a89b5da12e2b4b4ae78f09c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Wed, 22 Apr 2020 20:15:03 +0200 Subject: [PATCH 6/7] Improve matrix specification in travis config --- .travis.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bbf77bdcc..bc31d585cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,17 +8,35 @@ env: - PYTEST_ADDOPTS='--color=yes' -python: - - 3.6 - - 3.7 +matrix: + include: + - name: "python=3.6, ctapipe=0.7" + python: 3.6 + env: + - CTAPIPE_VERSION="v0.7.0" + - CTAPIPE_IO_LST_VERSION="v0.4.1" -env: - - CTAPIPE_VERSION="v0.7.0" CTAPIPE_IO_LST_VERSION="v0.4.1" PROTOZFITS_VERSION=v1.4.2 - - CTAPIPE_VERSION="master" CTAPIPE_IO_LST_VERSION="master" PROTOZFITS_VERSION="master" + - name: "python=3.7, ctapipe=0.7" + python: 3.7 + env: + - CTAPIPE_VERSION="v0.7.0" + - CTAPIPE_IO_LST_VERSION="v0.4.1" + + - name: "python=3.6, ctapipe=master" + python: 3.6 + env: + - CTAPIPE_VERSION="master" + - CTAPIPE_IO_LST_VERSION="master" + + - name: "python=3.7, ctapipe=master" + python: 3.7 + env: + - CTAPIPE_VERSION="master" + - CTAPIPE_IO_LST_VERSION="master" -matrix: allow_failures: - - env: CTAPIPE_VERSION="master" CTAPIPE_IO_LST_VERSION="master" PROTOZFITS_VERSION="master" + - name: "python=3.6, ctapipe=master" + - name: "python=3.7, ctapipe=master" before_install: From c008c65f878451b9d2c4c8fdb1e4641a8a00194d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20N=C3=B6the?= Date: Thu, 23 Apr 2020 12:57:51 +0200 Subject: [PATCH 7/7] Add python_requires to setup.cfg --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index f3c0032467..3fa5f96799 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,3 +8,6 @@ url=https://github.com/cta-observatory/cta-lstchain long_description = file: README.md long_description_content_type = text/markdown github_project = cta-observatory/cta-lstchain + +[options] +python_requires = >=3.6