diff --git a/.circleci/config.yml b/.circleci/config.yml index ff90d31..f777181 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,10 +13,10 @@ commands: which conda || source $HOME/miniconda3/bin/activate base 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 [[ $CIRCLE_TAG == "" ]]; then conda config --add channels chilipp/label/${CIRCLE_BRANCH}; fi + if [[ $CIRCLE_TAG == "" ]]; then conda config --add channels psyplot/label/${CIRCLE_BRANCH}; fi - run: name: Environment info command: | diff --git a/.github/issue_template.md b/.github/issue_template.md index fbbb60f..142a180 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-gui/issues/new?template=new_feature.md&title=NEW+FEATURE:). +For requesting new features, use [this template](https://github.com/psyplot/psyplot-gui/issues/new?template=new_feature.md&title=NEW+FEATURE:). -For changing existing features, use [this template](https://github.com/Chilipp/psyplot-gui/issues/new?template=change_feature.md&title=CHANGE+FEATURE:). +For changing existing features, use [this template](https://github.com/psyplot/psyplot-gui/issues/new?template=change_feature.md&title=CHANGE+FEATURE:). diff --git a/.travis.yml b/.travis.yml index 99f2bc0..3b45f5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,10 @@ env: - PYTHON_VERSION=3.8 USE_PIP=true # python 3.7 - PYTHON_VERSION=3.7 QT_VERSION=5 DEPLOY_CONDA=true + - PYTHON_VERSION=3.7 QT_VERSION=5 DEPLOY_CONDA=true BUILD_STR_END= global: - - secure: "ra6jCfg7U1XTyeJS3J9KfY1/mPwGnjrnHO0ANG54Bk29TCl46LgChdCgjjz7fysS8CUfq4QS4Y1LrVFA6eK+JSqVS3LGJ1QZxBO3NTIPe/1WuIc3rmNpNDrvtTuncM6IN6fDfOCR2FCA4WipH3JnXjNkz+5rwgWg3ynf9KrSZhlLDdAxqO6phHXK99qOrN3sZCxnlg69iqPTv9aZkC/2RTrZ4fMuqc6zGHLL8rrQ/w93nEd7DP5vYlam0a1QfIXuR01a0C3y2D6LaVY5uXzTFIKCKFJmB9OuEazNMaxUhBbXdRt0eQAw9mGonMFhRnUiEFV8N1aoDyFu0t8YLWpIn3EAzpN0OJtpK5A8hKvoFSKyjbnu/1JLRR+Hsg7ufVT8KErxInge/GO5ugDOHcufFVv1mdysUQm7LndFt1nX0FbeUT6fYKIB3yLH6U3vNrgy+yrWynHXFMfL7ClI7yaRfXYGku4RNZZocIGErxaVIV7ArOAMs0YwabROChQSHO/M85u+eOi9qXNJ1Jst7xT3gXkCwXC1vTMqe6x6j4RlWedvYHLaAANhXyOQYgLxl6f2XotQDZzA/+OODeivyTJ/lr4aq1L+fi7sPruiBYQ7+a3ZAnc9U6zXdFrq4K2/+7DQXs9BRKQguxMEAo9FToHB8zNF5I8Sr/P7BmZIseby1xg=" + - BUILD_STR_END=cf + - secure: "erSMDYgwd78VvJwe6nhEJr/PKpyXG9GepNLzJ3vK/b+w8jMWp9LxZKOZtROhTs1SMYtKexDvHvBhuoBVZ2ysSCIuWPCPBI5wbfAvgaUvD8reHL3YJ33hSgtoVUenn6LFoFEqbNg73FfuKdwar7xVCggYtare6ud5Bali32BPyhVea07uY2DpN5FLKDSSRgoV8hDwqGAGlL/qiigkewS4yK18pbEkLus/FlyvsEWmaCUanWgW4JAprn1zrQ7al8WphooGYS9iAAMtdC1XiAN/P2tFsbxQQgVYPO0JalRePmyLvn3nwWU/JjLGVUmEZkK1FksOIrHQITQdl5DZHhcIGFPlIHf5li7jG4J6OAPqpQzq+cbbAHl0rPwyeBrKb6gBz+d52KcQKTkCoUYUvuq8T+sq7g+JWB1n4DHvmwA5krPeI6lMPLcv3BFiQ67aK2PKcM9qvEAfxO8odeTfPvzvyCP6hWTEfFRWozPIdZ6g1qw15szfBJ2jzIKtmljB68OLgLcavsOo1i6CszLNjeBoKb3AoVItTJTj4RqQrABPC2Jrd/1p6YU0hi6uK0xZk/X25p9TwsaefBpLi2sE2FpE2t0Aumw1KtjWn0z9pGXWkeceDfyUu+2KHJEnrtVuy/nr8gDXDuWZMRMQmHY7rc45bfZWbhfYjakC8Hc9c6eXhsY=" os: - linux @@ -85,13 +87,17 @@ install: echo "" echo "Configuring conda." conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge - conda config --add channels chilipp + if [[ ${BUILD_STR_END} == "cf" ]]; then + conda config --add channels conda-forge + else + conda config --add channels chilipp/label/conda-forge + fi + 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 pyqt=${QT_VERSION} - if [[ $USE_PIP == true ]]; then @@ -111,6 +117,6 @@ script: # export the pw to make it available for the deploy - reset_secure # deploy here (don't use travis deploy because it requires homebrew) - - if [[ $DEPLOY_CONDA == "true" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_REPO_SLUG == "Chilipp/psyplot-gui" ]]; then + - if [[ $DEPLOY_CONDA == "true" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_REPO_SLUG == "psyplot/psyplot-gui" ]]; then ci/deploy_anaconda.py; fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2befc4..5c34d70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,4 +2,4 @@ :+1::tada: First off, thanks for taking the time to contribute! :tada::+1: -For some guidelines, please see the [contribution guidelines for psyplot](https://github.com/Chilipp/psyplot/blob/master/CONTRIBUTING.md). +For some guidelines, please see the [contribution guidelines for psyplot](https://github.com/psyplot/psyplot/blob/master/CONTRIBUTING.md). diff --git a/README.rst b/README.rst index bd3b4a0..a402b2c 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ Graphical User Interface for the psyplot package * - docs - |docs| * - tests - - |travis| |appveyor| |requires| |coveralls| + - |travis| |appveyor| |requires| |codecov| * - package - |version| |conda| |supported-versions| |supported-implementations| @@ -18,21 +18,21 @@ Graphical User Interface for the psyplot package :alt: Documentation Status :target: http://psyplot-gui.readthedocs.io/en/latest/?badge=latest -.. |travis| image:: https://travis-ci.org/Chilipp/psyplot-gui.svg?branch=master +.. |travis| image:: https://travis-ci.org/psyplot/psyplot-gui.svg?branch=master :alt: Travis - :target: https://travis-ci.org/Chilipp/psyplot-gui + :target: https://travis-ci.org/psyplot/psyplot-gui -.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/gkao9p38wy5e2nh6/branch/master?svg=true +.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/bud4ov6lddrjvt88/branch/master?svg=true :alt: AppVeyor - :target: https://ci.appveyor.com/project/Chilipp/psyplot-gui-q726s + :target: https://ci.appveyor.com/project/psyplot/psyplot-gui-q726s -.. |coveralls| image:: https://coveralls.io/repos/github/Chilipp/psyplot-gui/badge.svg?branch=master +.. |codecov| image:: https://codecov.io/gh/psyplot/psyplot-gui/branch/master/graph/badge.svg :alt: Coverage - :target: https://coveralls.io/github/Chilipp/psyplot-gui?branch=master + :target: https://codecov.io/gh/psyplot/psyplot-gui -.. |requires| image:: https://requires.io/github/Chilipp/psyplot-gui/requirements.svg?branch=master +.. |requires| image:: https://requires.io/github/psyplot/psyplot-gui/requirements.svg?branch=master :alt: Requirements Status - :target: https://requires.io/github/Chilipp/psyplot-gui/requirements/?branch=master + :target: https://requires.io/github/psyplot/psyplot-gui/requirements/?branch=master .. |version| image:: https://img.shields.io/pypi/v/psyplot-gui.svg?style=flat :alt: PyPI Package latest release diff --git a/appveyor.yml b/appveyor.yml index b1f1e99..72eb041 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,8 +6,12 @@ environment: matrix: - PYTHON_VERSION: "3.8" QT_VERSION: "5" + BUILD_STR_END: cf - PYTHON_VERSION: "3.7" QT_VERSION: "5" + - PYTHON_VERSION: "3.7" + QT_VERSION: "5" + BUILD_STR_END: cf install: # windows config (for installation) @@ -16,8 +20,8 @@ install: - cmd: set CONDA_REPO_TOKEN= # conda config - conda config --set always_yes yes --set changeps1 no - - conda config --add channels conda-forge - - conda config --add channels chilipp + - IF NOT DEFINED BUILD_STR_END (conda config --add channels chilipp/label/conda-forge) ELSE (conda config --add channels conda-forge) + - conda config --add channels psyplot - conda update -q conda - conda install conda-build anaconda-client - conda info -a @@ -26,7 +30,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 pyqt=%QT_VERSION% build: off diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 9860c0d..f1fe8eb 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 %}{% if environ.get("BUILD_STR_END") %}_{{ environ.get("BUILD_STR_END") }}{% endif %} skip: true # [py == 27] requirements: @@ -25,6 +25,9 @@ requirements: - fasteners - sphinx - sphinx_rtd_theme + # HACK: Should be removed when https://github.com/ipython/ipykernel/pull/489 + # is implemented + - jupyter_client <6.0.0 test: imports: @@ -59,7 +62,7 @@ app: type: desk about: - home: https://github.com/Chilipp/psyplot-gui + home: https://github.com/psyplot/psyplot-gui license: GPL-2.0 license_family: GPL license_file: LICENSE @@ -69,4 +72,4 @@ about: This package provides a graphical user interface to interact with the psyplot framework. doc_url: http://psyplot.readthedocs.io/projects/psyplot-gui - dev_url: https://github.com/Chilipp/psyplot-gui + dev_url: https://github.com/psyplot/psyplot-gui diff --git a/docs/environment.yml b/docs/environment.yml index 0fbf822..11ce43c 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,10 +1,12 @@ name: psyplot_gui_docs channels: - - chilipp/label/dev - - chilipp/label/master - - chilipp + - psyplot/label/gh-migration + - psyplot/label/dev + - psyplot/label/master + - psyplot + - chilipp/label/conda-forge dependencies: - - python=3.7 + - python>3.5 - qtconsole - ipykernel - pexpect diff --git a/docs/index.rst b/docs/index.rst index 2239ab7..afb5921 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -18,7 +18,7 @@ main project on examples on the possibilities with psyplot_. * - docs - |docs| * - tests - - |travis| |appveyor| |requires| |coveralls| + - |travis| |appveyor| |requires| |codecov| * - package - |version| |conda| |supported-versions| |supported-implementations| @@ -26,21 +26,21 @@ main project on examples on the possibilities with psyplot_. :alt: Documentation Status :target: http://psyplot-gui.readthedocs.io/en/latest/?badge=latest - .. |travis| image:: https://travis-ci.org/Chilipp/psyplot-gui.svg?branch=master + .. |travis| image:: https://travis-ci.org/psyplot/psyplot-gui.svg?branch=master :alt: Travis - :target: https://travis-ci.org/Chilipp/psyplot-gui + :target: https://travis-ci.org/psyplot/psyplot-gui - .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/gkao9p38wy5e2nh6/branch/master?svg=true + .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/bud4ov6lddrjvt88/branch/master?svg=true :alt: AppVeyor - :target: https://ci.appveyor.com/project/Chilipp/psyplot-gui-q726s + :target: https://ci.appveyor.com/project/psyplot/psyplot-gui-q726s - .. |coveralls| image:: https://coveralls.io/repos/github/Chilipp/psyplot-gui/badge.svg?branch=master + .. |codecov| image:: https://codecov.io/gh/psyplot/psyplot-gui/branch/master/graph/badge.svg :alt: Coverage - :target: https://coveralls.io/github/Chilipp/psyplot-gui?branch=master + :target: https://codecov.io/gh/psyplot/psyplot-gui - .. |requires| image:: https://requires.io/github/Chilipp/psyplot-gui/requirements.svg?branch=master + .. |requires| image:: https://requires.io/github/psyplot/psyplot-gui/requirements.svg?branch=master :alt: Requirements Status - :target: https://requires.io/github/Chilipp/psyplot-gui/requirements/?branch=master + :target: https://requires.io/github/psyplot/psyplot-gui/requirements/?branch=master .. |version| image:: https://img.shields.io/pypi/v/psyplot-gui.svg?style=flat :alt: PyPI Package latest release diff --git a/psyplot_gui/main.py b/psyplot_gui/main.py index 6a0705a..6248bd2 100644 --- a/psyplot_gui/main.py +++ b/psyplot_gui/main.py @@ -741,7 +741,7 @@ def about(self): } versions.update(psyplot_gui.get_versions()['requirements']) versions.update(psyplot._get_versions()['requirements']) - versions['github'] = 'https://github.com/Chilipp/psyplot' + versions['github'] = 'https://github.com/psyplot/psyplot' versions['author'] = psyplot.__author__ QMessageBox.about( self, "About psyplot", diff --git a/setup.py b/setup.py index c942382..a5e3938 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def run_tests(self): ], keywords=('visualization netcdf raster cartopy earth-sciences pyqt qt ' 'ipython jupyter qtconsole'), - url='https://github.com/Chilipp/psyplot-gui', + url='https://github.com/psyplot/psyplot-gui', author='Philipp Sommer', author_email='philipp.sommer@unil.ch', license="GPLv2",