From e1d15e95902b5c3f038d8e18b94bad1330acd6a4 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 13:12:59 +0100 Subject: [PATCH 01/15] Updated appveyor project to psyplot/psyplot --- README.rst | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 234bf27..7c3410c 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ The psyplot interactive visualization framework :alt: Travis :target: https://travis-ci.org/Chilipp/psyplot -.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/3jk6ea1n4a4dl6vk/branch/master?svg=true +.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4nt6qrw66iw65w33/branch/master?svg=true :alt: AppVeyor :target: https://ci.appveyor.com/project/Chilipp/psyplot/branch/master diff --git a/docs/index.rst b/docs/index.rst index 2d2f2d2..c191d1b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -61,7 +61,7 @@ on `GitHub `__. :alt: Travis :target: https://travis-ci.org/Chilipp/psyplot - .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/3jk6ea1n4a4dl6vk/branch/master?svg=true + .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4nt6qrw66iw65w33/branch/master?svg=true :alt: AppVeyor :target: https://ci.appveyor.com/project/Chilipp/psyplot/branch/master From eed529baf806f5cdb1e834ba563c0d2985278975 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 13:19:57 +0100 Subject: [PATCH 02/15] Updated requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb96f27..519c423 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Matplotlib # https://github.com/matplotlib/matplotlib/blob/master/CHANGELOG -matplotlib==3.1.2 # rq.filter: >=1.4 +matplotlib==3.2.1 # rq.filter: >=1.4 # xarray # https://github.com/pydata/xarray/blob/stable/doc/whats-new.rst From 071d2757b9fac58ee428805bcc850bdd3acb22dc Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 13:20:31 +0100 Subject: [PATCH 03/15] Updated requires.io badge --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 7c3410c..6cce2c2 100644 --- a/README.rst +++ b/README.rst @@ -33,9 +33,9 @@ The psyplot interactive visualization framework :alt: Coverage :target: https://coveralls.io/github/Chilipp/psyplot?branch=master -.. |requires| image:: https://requires.io/github/Chilipp/psyplot/requirements.svg?branch=master +.. |requires| image:: https://requires.io/github/psyplot/psyplot/requirements.svg?branch=master :alt: Requirements Status - :target: https://requires.io/github/Chilipp/psyplot/requirements/?branch=master + :target: https://requires.io/github/psyplot/psyplot/requirements/?branch=master .. |version| image:: https://img.shields.io/pypi/v/psyplot.svg?style=flat :alt: PyPI Package latest release From ddd8021615f14190a576f5a9e93a3f98c89c3ce3 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 19:15:28 +0100 Subject: [PATCH 04/15] Updated CONDA_REPO_TOKEN --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61ac465..63fe13a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ env: - PYTHON_VERSION=3.7 XARRAY_VERSION=0.13 - PYTHON_VERSION=3.7 XARRAY_VERSION=0.12 global: - secure: "XUhVE/QHgOl6uhPpKJ6Kn0POurK719Vly0xeuK9giTz+kpAFcC5b88S2PtaL/BnW+TgV2LxdoKiEqZy1rhhjLfo/8tktiAK2N774HTxbVFVGztgwbqL8u+5FFTMAfDKT7F0R2qvF5/xAGU3tAVEMgkbhc2ZreXO+ah/ndCYo2YVe5SfEw6rkqZErgqJUSZSddxVQ6J6Mz6Mh1fIYZxu1kKJN2uGNNfQGcnt4MpVAdepSjmtUkgPQ6oszwhX34UzJWn5wQCSJDBNpKSgo2WTGy4PVgDNaI/SeEPdKmNSKwfeiBwsojdK5CBL3w2QatwHMpRtBPdsi3l3qJGE/c36Zzrc8Zk5LqTQt/5IVLRZdH4OUZW8a3X/RILsMFzQ8FhJRzimzhkZqdlZFbBc90qed3TmiZUVMjkFMG3+/b4tyy6Oe37e3EzV06Fa/hAF7iS2kmEobCvSUT4kLYxIid7vpo79HjHukudiHMxJYWdBbnal1C3fAs7TZOX08ZOzIsU5wUz8bEjnmso0F4kjxU43q3+Kq/wIlV0Mz2azAv8ZOdm0nswJYILe0LJLl/JMRJ9TvekNuYGe/2dK4AimZYJD5fpdkS00kPHNi6lmqfOdqODXkU+HFm7EO3QuHBuoI8fsraInpDx+1nyqIvKG5wGDn57TiMNLE9JQInzl6A2t55sc=" - + secure: "cU0AKSwMJDE4kSPdohXX86URKIlVbbLjxJvwyL7T5pu1L+s4ZM6CxHRalUks2N/JSBefnpl2UokIpTePYKS2t1Xn7MKUaFOtLlA22lqz7JFuM9q0qQewtZLheMXClx6QhcZey78aE+oU8dG0RT5GKYPXyznGP41JSXKdOHiwj8sbHhYy1iJcUaKa7AoFYoQgnyhi+oobDm6neUvg9RHN3OwtSALAy2CjHs/fVUEImM14XXsg4WfjHfuNr3vBNSOHNfnXc+sqUOEyxKmb8Q45AElkueMLOt6x2TvKDByHQdQybQ0jBkByHGZ48us1Tx5N+Swwg9+KUVp2Aj8wom/im721exdUC5+sC6bZnp75vSVKk4jgpVU89FTJV57FGfTZzvu032+ybJgs4g3lBb+c1TkbYLJzlZqxZVy29vKZNGjFH553wtFxXJLBOr60ka7xj1o7x4s7IsVCsxRzBOaCcCRKY2B5HJMpw5lMzf/nvWNz38uT2Qw8EduhGxKOfbCew2NSmIZB8JoL0U6UfrETlurAgttKZO6ff7TAb7hICpuZagnovIA1Ve1GPmYj1Ste5C0WxEdWFTog+py3ki4mOXi9BxsbN0Ir8f/VyX67s3uA6kMaZRppauSXEvKEM5LBtIZdB7p4pfqMpbm1TC1whK12/lBWFn/12+FqEHi27Lg=" os: - linux - osx From 8c5b3d13c1243c4a2fa5231d5afc781903a0ade5 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 19:56:55 +0100 Subject: [PATCH 05/15] Use psyplot conda channel --- .travis.yml | 4 ++-- appveyor.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63fe13a..d7da8dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,12 +90,12 @@ install: echo "Configuring conda." conda config --set always_yes yes --set changeps1 no conda config --add channels conda-forge - conda config --add channels chilipp + conda config --add channels psyplot conda update -q conda conda install conda-build anaconda-client conda-verify - if [[ $TRAVIS_TAG == "" ]]; then export GIT_BRANCH=$TRAVIS_BRANCH; - conda config --add channels chilipp/label/${TRAVIS_BRANCH}; + conda config --add channels psyplot/label/${TRAVIS_BRANCH}; fi - python ci/setup_append.py ci/conda-recipe xarray=${XARRAY_VERSION} - if [[ $USE_PIP == true ]]; then diff --git a/appveyor.yml b/appveyor.yml index 2d08182..a6064da 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ install: # conda config - conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge - - conda config --add channels chilipp + - conda config --add channels psyplot - conda update -q conda - conda install conda-build anaconda-client - conda info -a @@ -26,7 +26,7 @@ install: - cmd: endlocal - cmd: 'SET PYTHONWARNINGS=ignore:mode:DeprecationWarning:docutils.io:245' - cmd: "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (SET GIT_BRANCH=%APPVEYOR_REPO_BRANCH%)" - - cmd: "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (conda config --add channels chilipp/label/%APPVEYOR_REPO_BRANCH%)" + - cmd: "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (conda config --add channels psyplot/label/%APPVEYOR_REPO_BRANCH%)" - cmd: python ci\\setup_append.py ci\\conda-recipe xarray=%XARRAY_VERSION% build: off From fa11facebf8b29d431ceaafa2e5ef7d2f22912d2 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 21:08:08 +0100 Subject: [PATCH 06/15] Replace '-' in conda build string --- ci/conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 8c202f9..4d1167c 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -10,7 +10,7 @@ source: build: number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} - string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH') }}{% endif %} + string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '' }}{% endif %} script: python -m pip install . --no-deps --ignore-installed -vvv entry_points: - psyplot = psyplot.__main__:main From 039aa3b8f49a133fe2fb9ff2bf4d45c52a6f813a Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 19 Mar 2020 21:09:27 +0100 Subject: [PATCH 07/15] typo --- ci/conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 4d1167c..e33a995 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -10,7 +10,7 @@ source: build: number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} - string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '' }}{% endif %} + string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %} script: python -m pip install . --no-deps --ignore-installed -vvv entry_points: - psyplot = psyplot.__main__:main From 1db148afebf435202ede7261e813ca2b0f3bf34c Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Fri, 20 Mar 2020 09:59:40 +0100 Subject: [PATCH 08/15] Force libtiff <4.1.0 on osx as an intermediate fix for https://github.com/conda-forge/libwebp-feedstock/issues/26 --- ci/conda-recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index e33a995..012f087 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -38,6 +38,11 @@ test: - netcdf4 - dask - scipy + # HACK: solve inconsistensies with libwebp + # this should be removed when + # https://github.com/conda-forge/libwebp-feedstock/issues/26 + # is solved + - libtiff <4.1.0 # [osx] source_files: - tests commands: From 895f0a91c32940aa9a747693454d9a18637004e9 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Fri, 20 Mar 2020 21:03:57 +0100 Subject: [PATCH 09/15] Use psyplot conda channel --- docs/environment.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 2609367..4e8f74f 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,14 +1,15 @@ name: psyplot_docs channels: - - chilipp/label/dev - - chilipp/label/master - - chilipp + - psyplot/label/gh-migration + - psyplot/label/dev + - psyplot/label/master + - psyplot dependencies: - - python=3.7 + - python>3.5 - dask - xarray - netCDF4 - - matplotlib=3.0.* + - matplotlib - seaborn - ipython - nbconvert From dd49293da92bf361e3e7baf982e257f4f97f8354 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Sun, 22 Mar 2020 09:52:38 +0100 Subject: [PATCH 10/15] Use conda-forge channel for docs --- docs/environment.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 4e8f74f..40aa408 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -4,22 +4,16 @@ channels: - psyplot/label/dev - psyplot/label/master - psyplot + - conda-forge dependencies: - python>3.5 - dask - xarray - netCDF4 - - matplotlib - seaborn - - ipython - - nbconvert - - jupyter_client - - ipykernel - - sphinx - psy-maps + - python-cdo + - cdo + - sphinx-argparse + - sphinx-nbexamples - pip - - pip: - - autodocsumm - - cdo - - sphinx-argparse - - sphinx-nbexamples From 5c4931e90901aaf82955e2b66b3cdc5b8ca1bd39 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Sun, 22 Mar 2020 10:16:41 +0100 Subject: [PATCH 11/15] Revert "Use conda-forge channel for docs" This reverts commit dd49293da92bf361e3e7baf982e257f4f97f8354. --- docs/environment.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 40aa408..4e8f74f 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -4,16 +4,22 @@ channels: - psyplot/label/dev - psyplot/label/master - psyplot - - conda-forge dependencies: - python>3.5 - dask - xarray - netCDF4 + - matplotlib - seaborn + - ipython + - nbconvert + - jupyter_client + - ipykernel + - sphinx - psy-maps - - python-cdo - - cdo - - sphinx-argparse - - sphinx-nbexamples - pip + - pip: + - autodocsumm + - cdo + - sphinx-argparse + - sphinx-nbexamples From f57e6297efa29cb67ebf4def0768d3a0236141d1 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Sun, 22 Mar 2020 11:04:08 +0100 Subject: [PATCH 12/15] make conda builds without conda-forge --- .travis.yml | 12 +++++++++++- ci/conda-recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7da8dd..5133b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,17 @@ env: matrix: # python 3.8 - PYTHON_VERSION=3.8 DEPLOY_CONDA=true + - PYTHON_VERSION=3.8 DEPLOY_CONDA=true USE_CF=false - PYTHON_VERSION=3.8 XARRAY_VERSION=0.15 - PYTHON_VERSION=3.8 XARRAY_VERSION=0.14 - PYTHON_VERSION=3.8 USE_PIP=true # python 3.7 - PYTHON_VERSION=3.7 DEPLOY_CONDA=true + - PYTHON_VERSION=3.7 DEPLOY_CONDA=true USE_CF=false - PYTHON_VERSION=3.7 XARRAY_VERSION=0.14 - PYTHON_VERSION=3.7 XARRAY_VERSION=0.13 - PYTHON_VERSION=3.7 XARRAY_VERSION=0.12 + global: secure: "cU0AKSwMJDE4kSPdohXX86URKIlVbbLjxJvwyL7T5pu1L+s4ZM6CxHRalUks2N/JSBefnpl2UokIpTePYKS2t1Xn7MKUaFOtLlA22lqz7JFuM9q0qQewtZLheMXClx6QhcZey78aE+oU8dG0RT5GKYPXyznGP41JSXKdOHiwj8sbHhYy1iJcUaKa7AoFYoQgnyhi+oobDm6neUvg9RHN3OwtSALAy2CjHs/fVUEImM14XXsg4WfjHfuNr3vBNSOHNfnXc+sqUOEyxKmb8Q45AElkueMLOt6x2TvKDByHQdQybQ0jBkByHGZ48us1Tx5N+Swwg9+KUVp2Aj8wom/im721exdUC5+sC6bZnp75vSVKk4jgpVU89FTJV57FGfTZzvu032+ybJgs4g3lBb+c1TkbYLJzlZqxZVy29vKZNGjFH553wtFxXJLBOr60ka7xj1o7x4s7IsVCsxRzBOaCcCRKY2B5HJMpw5lMzf/nvWNz38uT2Qw8EduhGxKOfbCew2NSmIZB8JoL0U6UfrETlurAgttKZO6ff7TAb7hICpuZagnovIA1Ve1GPmYj1Ste5C0WxEdWFTog+py3ki4mOXi9BxsbN0Ir8f/VyX67s3uA6kMaZRppauSXEvKEM5LBtIZdB7p4pfqMpbm1TC1whK12/lBWFn/12+FqEHi27Lg=" os: @@ -89,7 +92,11 @@ install: echo "" echo "Configuring conda." conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge + if [[ ${USE_CF} != false ]]; then + conda config --add channels conda-forge + else + conda config --add channels chilipp + fi conda config --add channels psyplot conda update -q conda conda install conda-build anaconda-client conda-verify @@ -101,6 +108,9 @@ install: - if [[ $USE_PIP == true ]]; then python -m pip install . -r ci/requirements.txt; fi + - if [[ $USE_CF != false ]]; then + export BUILD_STR_END=cf; + fi - conda info -a - conda list - reset_secure diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 012f087..59ae906 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -10,7 +10,7 @@ source: build: number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} - string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %} + string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %}{% if environ.get("BUILD_STR_END") %}_{{ environ.get("BUILD_STR_END") }}{% endif %} script: python -m pip install . --no-deps --ignore-installed -vvv entry_points: - psyplot = psyplot.__main__:main From 5578c8fce7de81d9d3d02f2f78414c37a51fd6e0 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Sun, 22 Mar 2020 11:41:25 +0100 Subject: [PATCH 13/15] Add builds without conda-forge --- .travis.yml | 11 ++++------- appveyor.yml | 5 ++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5133b15..833c352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,19 +10,19 @@ env: matrix: # python 3.8 - PYTHON_VERSION=3.8 DEPLOY_CONDA=true - - PYTHON_VERSION=3.8 DEPLOY_CONDA=true USE_CF=false - PYTHON_VERSION=3.8 XARRAY_VERSION=0.15 - PYTHON_VERSION=3.8 XARRAY_VERSION=0.14 - PYTHON_VERSION=3.8 USE_PIP=true # python 3.7 - PYTHON_VERSION=3.7 DEPLOY_CONDA=true - - PYTHON_VERSION=3.7 DEPLOY_CONDA=true USE_CF=false + - PYTHON_VERSION=3.7 DEPLOY_CONDA=true BUILD_STR_END= - PYTHON_VERSION=3.7 XARRAY_VERSION=0.14 - PYTHON_VERSION=3.7 XARRAY_VERSION=0.13 - PYTHON_VERSION=3.7 XARRAY_VERSION=0.12 global: - secure: "cU0AKSwMJDE4kSPdohXX86URKIlVbbLjxJvwyL7T5pu1L+s4ZM6CxHRalUks2N/JSBefnpl2UokIpTePYKS2t1Xn7MKUaFOtLlA22lqz7JFuM9q0qQewtZLheMXClx6QhcZey78aE+oU8dG0RT5GKYPXyznGP41JSXKdOHiwj8sbHhYy1iJcUaKa7AoFYoQgnyhi+oobDm6neUvg9RHN3OwtSALAy2CjHs/fVUEImM14XXsg4WfjHfuNr3vBNSOHNfnXc+sqUOEyxKmb8Q45AElkueMLOt6x2TvKDByHQdQybQ0jBkByHGZ48us1Tx5N+Swwg9+KUVp2Aj8wom/im721exdUC5+sC6bZnp75vSVKk4jgpVU89FTJV57FGfTZzvu032+ybJgs4g3lBb+c1TkbYLJzlZqxZVy29vKZNGjFH553wtFxXJLBOr60ka7xj1o7x4s7IsVCsxRzBOaCcCRKY2B5HJMpw5lMzf/nvWNz38uT2Qw8EduhGxKOfbCew2NSmIZB8JoL0U6UfrETlurAgttKZO6ff7TAb7hICpuZagnovIA1Ve1GPmYj1Ste5C0WxEdWFTog+py3ki4mOXi9BxsbN0Ir8f/VyX67s3uA6kMaZRppauSXEvKEM5LBtIZdB7p4pfqMpbm1TC1whK12/lBWFn/12+FqEHi27Lg=" + - BUILD_STR_END=cf + - secure: "cU0AKSwMJDE4kSPdohXX86URKIlVbbLjxJvwyL7T5pu1L+s4ZM6CxHRalUks2N/JSBefnpl2UokIpTePYKS2t1Xn7MKUaFOtLlA22lqz7JFuM9q0qQewtZLheMXClx6QhcZey78aE+oU8dG0RT5GKYPXyznGP41JSXKdOHiwj8sbHhYy1iJcUaKa7AoFYoQgnyhi+oobDm6neUvg9RHN3OwtSALAy2CjHs/fVUEImM14XXsg4WfjHfuNr3vBNSOHNfnXc+sqUOEyxKmb8Q45AElkueMLOt6x2TvKDByHQdQybQ0jBkByHGZ48us1Tx5N+Swwg9+KUVp2Aj8wom/im721exdUC5+sC6bZnp75vSVKk4jgpVU89FTJV57FGfTZzvu032+ybJgs4g3lBb+c1TkbYLJzlZqxZVy29vKZNGjFH553wtFxXJLBOr60ka7xj1o7x4s7IsVCsxRzBOaCcCRKY2B5HJMpw5lMzf/nvWNz38uT2Qw8EduhGxKOfbCew2NSmIZB8JoL0U6UfrETlurAgttKZO6ff7TAb7hICpuZagnovIA1Ve1GPmYj1Ste5C0WxEdWFTog+py3ki4mOXi9BxsbN0Ir8f/VyX67s3uA6kMaZRppauSXEvKEM5LBtIZdB7p4pfqMpbm1TC1whK12/lBWFn/12+FqEHi27Lg=" os: - linux - osx @@ -92,7 +92,7 @@ install: echo "" echo "Configuring conda." conda config --set always_yes yes --set changeps1 no - if [[ ${USE_CF} != false ]]; then + if [[ ${BUILD_STR_END} == "cf" ]]; then conda config --add channels conda-forge else conda config --add channels chilipp @@ -108,9 +108,6 @@ install: - if [[ $USE_PIP == true ]]; then python -m pip install . -r ci/requirements.txt; fi - - if [[ $USE_CF != false ]]; then - export BUILD_STR_END=cf; - fi - conda info -a - conda list - reset_secure diff --git a/appveyor.yml b/appveyor.yml index a6064da..2b577c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,8 +6,11 @@ environment: matrix: - PYTHON_VERSION: "3.7" XARRAY_VERSION: "0.14" + BUILD_STR_END: cf + - PYTHON_VERSION: "3.7" - PYTHON_VERSION: "3.8" XARRAY_VERSION: "0.15" + BUILD_STR_END: cf install: # windows config (for installation) @@ -16,7 +19,7 @@ install: - cmd: set CONDA_REPO_TOKEN= # conda config - conda config --set always_yes yes --set changeps1 no - - conda config --add channels conda-forge + - IF NOT DEFINED BUILD_STR_END (conda config --add channels chilipp) ELSE (conda config --add channels conda-forge) - conda config --add channels psyplot - conda update -q conda - conda install conda-build anaconda-client From efa619bbb7ddf2f6e22cfeddd593b7eff1aea4d6 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Sun, 22 Mar 2020 20:40:21 +0100 Subject: [PATCH 14/15] Add chilipp/label/conda-forge channel --- docs/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/environment.yml b/docs/environment.yml index 4e8f74f..1f67527 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -4,6 +4,7 @@ channels: - psyplot/label/dev - psyplot/label/master - psyplot + - chilipp/label/conda-forge dependencies: - python>3.5 - dask From d11902b2fe6f28b5eb5bcc293474b36b6f4c6650 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Mon, 23 Mar 2020 12:03:03 +0100 Subject: [PATCH 15/15] Updated links to psyplot organization --- .github/issue_template.md | 4 ++-- CHANGELOG.rst | 10 +++++----- CONTRIBUTING.md | 14 +++++++------- README.rst | 18 +++++++++--------- codemeta.json | 2 +- docs/conf.py | 2 +- docs/contribute.rst | 24 ++++++++++++------------ docs/index.rst | 24 ++++++++++++------------ docs/installing.rst | 4 ++-- docs/plugins.rst | 4 ++-- docs/projects.rst | 16 ++++++++-------- setup.py | 2 +- 12 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 38fac36..0c7008f 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -25,6 +25,6 @@ very long error message #### NOTE This is a bug report. -For requesting new features, use [this template](https://github.com/Chilipp/psyplot/issues/new?template=new_feature.md&title=NEW+FEATURE:). +For requesting new features, use [this template](https://github.com/psyplot/psyplot/issues/new?template=new_feature.md&title=NEW+FEATURE:). -For changing existing features, use [this template](https://github.com/Chilipp/psyplot/issues/new?template=change_feature.md&title=CHANGE+FEATURE:). +For changing existing features, use [this template](https://github.com/psyplot/psyplot/issues/new?template=change_feature.md&title=CHANGE+FEATURE:). diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 84b2edf..8fd3062 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,7 +21,7 @@ Removed Changed ------- * We generalized the handling of unstructured data as lined out in - `issue#6 `__. The new method + `issue#6 `__. The new method ``psyplot.data.CFDecoder.get_cell_node_coord`` returns the coordinates of the nodes for a given grid cell. These informations are used by the psy-simple and psy-maps plugins for displaying any unstructured data. See @@ -29,7 +29,7 @@ Changed `visualization of unstructured grids `__ * We removed the inplace parameter for the CFDecoder methods since it is deprecated with xarray 0.12 (see - `issue #8 `__). The + `issue #8 `__). The ``CFDecoder.decode_ds`` method now always decodes inplace v1.1.0 @@ -109,6 +109,6 @@ Changed ``$HOME/.config/psyplot`` (as it is for linux) -.. _psy-simple: https://github.com/Chilipp/psy-simple -.. _psy-maps: https://github.com/Chilipp/psy-maps -.. _psy-reg: https://github.com/Chilipp/psy-reg +.. _psy-simple: https://github.com/psyplot/psy-simple +.. _psy-maps: https://github.com/psyplot/psy-maps +.. _psy-reg: https://github.com/psyplot/psy-reg diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d1c5f78..e4c3aa6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,11 +31,11 @@ This project and everyone participating in it is governed by the [psyplot Code o `psyplot` is just the framework that allows interactive data analysis and visualization. Much of the functionality however is implemented by other packages. What package is the correct one for your bug report/feature request, can be determined by the following list -* [psyplot-gui](https://github.com/Chilipp/psyplot-gui/issues): Everything specific to the graphical user interface -* [psy-simple](https://github.com/Chilipp/psy-simple/issues): Everything concerning, e.g. the `lineplot`, `plot2d`, `density` or `vector` plot methods -* [psy-maps](https://github.com/Chilipp/psy-maps/issues): Everything concerning, e.g. the `mapplot`, `mapvector` `mapcombined` plot methods -* [psy-reg](https://github.com/Chilipp/psy-reg/issues): Everything concerning, e.g. the `linreg` or `densityreg` plot methods -* [psyplot](https://github.com/Chilipp/psyplot/issues): Everything concerning the general framework, e.g. data handling, parallel update, etc. +* [psyplot-gui](https://github.com/psyplot/psyplot-gui/issues): Everything specific to the graphical user interface +* [psy-simple](https://github.com/psyplot/psy-simple/issues): Everything concerning, e.g. the `lineplot`, `plot2d`, `density` or `vector` plot methods +* [psy-maps](https://github.com/psyplot/psy-maps/issues): Everything concerning, e.g. the `mapplot`, `mapvector` `mapcombined` plot methods +* [psy-reg](https://github.com/psyplot/psy-reg/issues): Everything concerning, e.g. the `linreg` or `densityreg` plot methods +* [psyplot](https://github.com/psyplot/psyplot/issues): Everything concerning the general framework, e.g. data handling, parallel update, etc. Concerning plot methods, you can simply find out which module implemented it via @@ -44,7 +44,7 @@ import psyplot.project as psy print(psy.plot.name-of-your-plot-method._plugin) ``` -If you still don't know, where to open the issue, just go for [psyplot](https://github.com/Chilipp/psyplot/issues). +If you still don't know, where to open the issue, just go for [psyplot](https://github.com/psyplot/psyplot/issues). ## How Can I Contribute? @@ -79,7 +79,7 @@ Include details about your configuration and environment: This section guides you through submitting an enhancement suggestion for psyplot, including completely new features and minor improvements to existing functionality. -If you want to change an existing feature, use the [change feature template](https://github.com/Chilipp/psyplot/issues/new?template=change_feature.md&title=CHANGE+FEATURE:), otherwise fill in the [new feature template](https://github.com/Chilipp/psyplot/issues/new?template=new_feature.md&title=NEW+FEATURE:). +If you want to change an existing feature, use the [change feature template](https://github.com/psyplot/psyplot/issues/new?template=change_feature.md&title=CHANGE+FEATURE:), otherwise fill in the [new feature template](https://github.com/psyplot/psyplot/issues/new?template=new_feature.md&title=NEW+FEATURE:). #### How Do I Submit A (Good) Enhancement Suggestion? diff --git a/README.rst b/README.rst index 6cce2c2..e5269b9 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ The psyplot interactive visualization framework * - docs - |docs| |joss| * - tests - - |travis| |appveyor| |requires| |coveralls| + - |travis| |appveyor| |requires| |codecov| * - package - |version| |conda| |github| * - implementations @@ -21,17 +21,17 @@ The psyplot interactive visualization framework :alt: Documentation Status :target: http://psyplot.readthedocs.io/en/latest/?badge=latest -.. |travis| image:: https://travis-ci.org/Chilipp/psyplot.svg?branch=master +.. |travis| image:: https://travis-ci.org/psyplot/psyplot.svg?branch=master :alt: Travis - :target: https://travis-ci.org/Chilipp/psyplot + :target: https://travis-ci.org/psyplot/psyplot .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4nt6qrw66iw65w33/branch/master?svg=true :alt: AppVeyor - :target: https://ci.appveyor.com/project/Chilipp/psyplot/branch/master + :target: https://ci.appveyor.com/project/psyplot/psyplot/branch/master -.. |coveralls| image:: https://coveralls.io/repos/github/Chilipp/psyplot/badge.svg?branch=master +.. |codecov| image:: https://codecov.io/gh/psyplot/psyplot/branch/master/graph/badge.svg :alt: Coverage - :target: https://coveralls.io/github/Chilipp/psyplot?branch=master + :target: https://codecov.io/gh/psyplot/psyplot .. |requires| image:: https://requires.io/github/psyplot/psyplot/requirements.svg?branch=master :alt: Requirements Status @@ -57,8 +57,8 @@ The psyplot interactive visualization framework :alt: Journal of Open Source Software :target: http://joss.theoj.org/papers/3535c28017003f0b5fb63b1b64118b60 -.. |github| image:: https://img.shields.io/github/release/Chilipp/psyplot.svg - :target: https://github.com/Chilipp/psyplot/releases/latest +.. |github| image:: https://img.shields.io/github/release/psyplot/psyplot.svg + :target: https://github.com/psyplot/psyplot/releases/latest :alt: Latest github release .. end-badges @@ -77,7 +77,7 @@ provides a graphical user interface for an easier interactive usage. The package is very new and there are many features that will be included in the future. So we are very pleased for feedback! Please simply raise an issue -on `GitHub `__ (see also +on `GitHub `__ (see also `How to contribute`_ in the docs). .. _psyplot-gui: http://psyplot.readthedocs.io/projects/psyplot-gui/en/latest diff --git a/codemeta.json b/codemeta.json index 40970d2..17567df 100644 --- a/codemeta.json +++ b/codemeta.json @@ -11,7 +11,7 @@ } ], "identifier": "", - "codeRepository": "https://github.com/Chilipp/psyplot.git", + "codeRepository": "https://github.com/psyplot/psyplot.git", "datePublished": "2017-07-28", "dateModified": "2017-07-28", "dateCreated": "2017-07-28", diff --git a/docs/conf.py b/docs/conf.py index af270df..d1ee210 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -96,7 +96,7 @@ # which is a bit of an overkill example_gallery_config = dict( dont_preprocess=['../examples/example_cdo.ipynb'], - urls='https://github.com/Chilipp/psyplot/blob/master/examples', + urls='https://github.com/psyplot/psyplot/blob/master/examples', binder_url='https://mybinder.org/v2/gh/Chilipp/psyplot/master?filepath=examples', ) diff --git a/docs/contribute.rst b/docs/contribute.rst index e8855fd..0d15ca2 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -16,7 +16,7 @@ Code of Conduct --------------- This project and everyone participating in it is governed by the -`psyplot Code of Conduct `__. +`psyplot Code of Conduct `__. By participating, you are expected to uphold this code. What should I know before I get started? @@ -30,17 +30,17 @@ and visualization. Much of the functionality however is implemented by other packages. What package is the correct one for your bug report/feature request, can be determined by the following list -- `psyplot-gui `__: +- `psyplot-gui `__: Everything specific to the graphical user interface -- `psy-simple `__: +- `psy-simple `__: Everything concerning, e.g. the ``lineplot``, ``plot2d``, ``density`` or ``vector`` plot methods -- `psy-maps `__: Everything +- `psy-maps `__: Everything concerning, e.g. the ``mapplot``, ``mapvector`` ``mapcombined`` plot methods -- `psy-reg `__: Everything +- `psy-reg `__: Everything concerning, e.g. the ``linreg`` or ``densityreg`` plot methods -- `psyplot `__: Everything +- `psyplot `__: Everything concerning the general framework, e.g. data handling, parallel update, etc. @@ -53,7 +53,7 @@ implemented it via print(psy.plot.name-of-your-plot-method._plugin) If you still don’t know, where to open the issue, just go for -`psyplot `__. +`psyplot `__. How Can I Contribute? --------------------- @@ -70,7 +70,7 @@ Before creating bug reports, please check existing issues and pull requests as you might find out that you don’t need to create one. When you are creating a bug report, please `include as many details as possible <#how-do-i-submit-a-good-bug-report>`__. Fill out `the required -template `__, the information it asks for +template `__, the information it asks for helps us resolve issues faster. **Note:** If you find a **Closed** issue that seems like it is the @@ -84,7 +84,7 @@ Bugs are tracked as `GitHub issues `__. After you’ve determined `which repository <#the-psyplot-framework>`__ your bug is related to, create an issue on that repository and provide the following -information by filling in `the template `__. +information by filling in `the template `__. Explain the problem and include additional details to help maintainers reproduce the problem: @@ -129,9 +129,9 @@ psyplot, including completely new features and minor improvements to existing functionality. If you want to change an existing feature, use the `change feature -template `__, +template `__, otherwise fill in the `new feature -template `__. +template `__. How Do I Submit A (Good) Enhancement Suggestion? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -171,7 +171,7 @@ and provide the following information: Pull Requests ~~~~~~~~~~~~~ -- Fill in `the required template `__ +- Fill in `the required template `__ - Do not include issue numbers in the PR title - Include screenshots and animated GIFs in your pull request whenever possible. diff --git a/docs/index.rst b/docs/index.rst index c191d1b..e58c3e9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -33,7 +33,7 @@ If you want more motivation: Have a look into the :ref:`about` section. The package is very new and there are many features that will be included in the future. So we are very pleased for feedback! Please simply raise an issue -on `GitHub `__. +on `GitHub `__. .. start-badges @@ -47,7 +47,7 @@ on `GitHub `__. * - docs - |docs| |joss| * - tests - - |travis| |appveyor| |requires| |coveralls| + - |travis| |appveyor| |requires| |codecov| * - package - |version| |conda| |github| * - implementations @@ -57,21 +57,21 @@ on `GitHub `__. :alt: Documentation Status :target: http://psyplot.readthedocs.io/en/latest/?badge=latest - .. |travis| image:: https://travis-ci.org/Chilipp/psyplot.svg?branch=master + .. |travis| image:: https://travis-ci.org/psyplot/psyplot.svg?branch=master :alt: Travis - :target: https://travis-ci.org/Chilipp/psyplot + :target: https://travis-ci.org/psyplot/psyplot .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4nt6qrw66iw65w33/branch/master?svg=true :alt: AppVeyor - :target: https://ci.appveyor.com/project/Chilipp/psyplot/branch/master + :target: https://ci.appveyor.com/project/psyplot/psyplot/branch/master - .. |coveralls| image:: https://coveralls.io/repos/github/Chilipp/psyplot/badge.svg?branch=master + .. |codecov| image:: https://codecov.io/gh/psyplot/psyplot/branch/master/graph/badge.svg :alt: Coverage - :target: https://coveralls.io/github/Chilipp/psyplot?branch=master + :target: https://codecov.io/gh/psyplot/psyplot - .. |requires| image:: https://requires.io/github/Chilipp/psyplot/requirements.svg?branch=master + .. |requires| image:: https://requires.io/github/psyplot/psyplot/requirements.svg?branch=master :alt: Requirements Status - :target: https://requires.io/github/Chilipp/psyplot/requirements/?branch=master + :target: https://requires.io/github/psyplot/psyplot/requirements/?branch=master .. |version| image:: https://img.shields.io/pypi/v/psyplot.svg?style=flat :alt: PyPI Package latest release @@ -93,8 +93,8 @@ on `GitHub `__. :alt: Journal of Open Source Software :target: http://joss.theoj.org/papers/3535c28017003f0b5fb63b1b64118b60 - .. |github| image:: https://img.shields.io/github/release/Chilipp/psyplot.svg - :target: https://github.com/Chilipp/psyplot/releases/latest + .. |github| image:: https://img.shields.io/github/release/psyplot/psyplot.svg + :target: https://github.com/psyplot/psyplot/releases/latest :alt: Latest github release .. end-badges @@ -161,7 +161,7 @@ releases page of the corresponding subproject. .. _the Journal of Open Source Software: http://joss.theoj.org/ .. _zenodo.org: https://zenodo.org/ -.. _releases page of psyplot: https://github.com/Chilipp/psyplot/releases/ +.. _releases page of psyplot: https://github.com/psyplot/psyplot/releases/ Acknowledgment -------------- diff --git a/docs/installing.rst b/docs/installing.rst index b84ed64..9dc0a24 100644 --- a/docs/installing.rst +++ b/docs/installing.rst @@ -61,7 +61,7 @@ Installation from source To install it from source, make sure you have the :ref:`dependencies` installed, clone the github_ repository via:: - git clone https://github.com/Chilipp/psyplot.git + git clone https://github.com/psyplot/psyplot.git and install it via:: @@ -162,7 +162,7 @@ Then build the docs via:: You then have to install the necessary modules for each of the examples in the new ``'py37'`` environment. -.. _github: https://github.com/Chilipp/psyplot +.. _github: https://github.com/psyplot/psyplot .. _ipykernel: https://ipykernel.readthedocs.io .. _pytest: https://pytest.org/latest/contents.html diff --git a/docs/plugins.rst b/docs/plugins.rst index 223592d..8526215 100644 --- a/docs/plugins.rst +++ b/docs/plugins.rst @@ -75,7 +75,7 @@ If you have new plugins that you think should be included in this list, please do not hesitate to open an issue on the `github project page of psyplot`_ or implement it by yourself in `this file`_ and make a pull request. -.. _this file: https://github.com/Chilipp/psyplot/blob/master/docs/plugins.rst +.. _this file: https://github.com/psyplot/psyplot/blob/master/docs/plugins.rst .. note:: @@ -99,7 +99,7 @@ implement it by yourself in `this file`_ and make a pull request. where ``PLUGIN_NAME`` is any of ``psy_simple, psy_maps``, etc. -.. _github project page of psyplot: https://github.com/Chilipp/psyplot +.. _github project page of psyplot: https://github.com/psyplot/psyplot .. _excluding_plugins: diff --git a/docs/projects.rst b/docs/projects.rst index 29d3eb3..77e6e1d 100644 --- a/docs/projects.rst +++ b/docs/projects.rst @@ -19,35 +19,35 @@ splitted into several subprojects. Each of them is accessible via See :ref:`plugins` for more informations on the plugins. .. |psyplot-gui-github| image:: GitHub-Mark-16px.png - :target: https://github.com/Chilipp/psyplot-gui + :target: https://github.com/psyplot/psyplot-gui :alt: github .. |psyplot-gui-release| image:: https://img.shields.io/github/release/Chilipp/psyplot-gui.svg?style=flat-square - :target: https://github.com/Chilipp/psyplot-gui/releases/latest + :target: https://github.com/psyplot/psyplot-gui/releases/latest :alt: Latest release .. |psy-simple-github| image:: GitHub-Mark-16px.png - :target: https://github.com/Chilipp/psy-simple + :target: https://github.com/psyplot/psy-simple :alt: github .. |psy-simple-release| image:: https://img.shields.io/github/release/Chilipp/psy-simple.svg?style=flat-square - :target: https://github.com/Chilipp/psy-simple/releases/latest + :target: https://github.com/psyplot/psy-simple/releases/latest :alt: Latest release .. |psy-maps-github| image:: GitHub-Mark-16px.png - :target: https://github.com/Chilipp/psy-maps + :target: https://github.com/psyplot/psy-maps :alt: github .. |psy-maps-release| image:: https://img.shields.io/github/release/Chilipp/psy-maps.svg?style=flat-square - :target: https://github.com/Chilipp/psy-maps/releases/latest + :target: https://github.com/psyplot/psy-maps/releases/latest :alt: Latest release .. |psy-reg-github| image:: GitHub-Mark-16px.png - :target: https://github.com/Chilipp/psy-reg + :target: https://github.com/psyplot/psy-reg :alt: github .. |psy-reg-release| image:: https://img.shields.io/github/release/Chilipp/psy-reg.svg?style=flat-square - :target: https://github.com/Chilipp/psy-reg/releases/latest + :target: https://github.com/psyplot/psy-reg/releases/latest :alt: Latest release .. |psyplot-conda-github| image:: GitHub-Mark-16px.png diff --git a/setup.py b/setup.py index 820b41d..999a134 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ def readme(): project_urls={ 'Documentation': 'https://psyplot.readthedocs.io', }, - url='https://github.com/Chilipp/psyplot', + url='https://github.com/psyplot/psyplot', author='Philipp Sommer', author_email='philipp.sommer@unil.ch', license="GPLv2",