Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/psy-maps/issues/new?template=new_feature.md&title=NEW+FEATURE:).
For requesting new features, use [this template](https://github.com/psyplot/psy-maps/issues/new?template=new_feature.md&title=NEW+FEATURE:).

For changing existing features, use [this template](https://github.com/Chilipp/psy-maps/issues/new?template=change_feature.md&title=CHANGE+FEATURE:).
For changing existing features, use [this template](https://github.com/psyplot/psy-maps/issues/new?template=change_feature.md&title=CHANGE+FEATURE:).
36 changes: 18 additions & 18 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
[submodule "tests/reference_figures/win32/py3.6/mpl2.0"]
path = tests/reference_figures/win32/py3.6/mpl2.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.6_mpl2.0
[submodule "tests/reference_figures/darwin/py3.6/mpl2.0"]
path = tests/reference_figures/darwin/py3.6/mpl2.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.6_mpl2.0
[submodule "tests/reference_figures/linux/py3.6/mpl2.0"]
path = tests/reference_figures/linux/py3.6/mpl2.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.6_mpl2.0
[submodule "tests/reference_figures/linux/py3.6/mpl2.1"]
path = tests/reference_figures/linux/py3.6/mpl2.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.6_mpl2.1
[submodule "tests/reference_figures/win32/py3.6/mpl2.1"]
path = tests/reference_figures/win32/py3.6/mpl2.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.6_mpl2.1
[submodule "tests/reference_figures/darwin/py3.6/mpl2.1"]
path = tests/reference_figures/darwin/py3.6/mpl2.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.6_mpl2.1
[submodule "tests/reference_figures/darwin/py3.6/mpl2.2"]
path = tests/reference_figures/darwin/py3.6/mpl2.2
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.6_mpl2.2
[submodule "tests/reference_figures/linux/py3.6/mpl2.2"]
path = tests/reference_figures/linux/py3.6/mpl2.2
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.6_mpl2.2
[submodule "tests/reference_figures/win32/py3.6/mpl2.2"]
path = tests/reference_figures/win32/py3.6/mpl2.2
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.6_mpl2.2
[submodule "tests/reference_figures/linux/py3.7/mpl3.0"]
path = tests/reference_figures/linux/py3.7/mpl3.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.7_mpl3.0
[submodule "tests/reference_figures/darwin/py3.7/mpl3.0"]
path = tests/reference_figures/darwin/py3.7/mpl3.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.7_mpl3.0
[submodule "tests/reference_figures/win32/py3.7/mpl3.0"]
path = tests/reference_figures/win32/py3.7/mpl3.0
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.7_mpl3.0
[submodule "tests/reference_figures/linux/py3.7/mpl3.1"]
path = tests/reference_figures/linux/py3.7/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.7_mpl3.1
[submodule "tests/reference_figures/darwin/py3.7/mpl3.1"]
path = tests/reference_figures/darwin/py3.7/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.7_mpl3.1
[submodule "tests/reference_figures/win32/py3.7/mpl3.1"]
path = tests/reference_figures/win32/py3.7/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.7_mpl3.1
[submodule "tests/reference_figures/darwin/py3.8/mpl3.1"]
path = tests/reference_figures/darwin/py3.8/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = darwin_py3.8_mpl3.1
[submodule "tests/reference_figures/linux/py3.8/mpl3.1"]
path = tests/reference_figures/linux/py3.8/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = linux_py3.8_mpl3.1
[submodule "tests/reference_figures/win32/py3.8/mpl3.1"]
path = tests/reference_figures/win32/py3.8/mpl3.1
url = https://github.com/Chilipp/psy-maps-references.git
url = https://github.com/psyplot/psy-maps-references.git
branch = win32_py3.8_mpl3.1
34 changes: 26 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: generic
env:
global:
- COMMIT_AUTHOR_EMAIL="philipp.sommer@unil.ch"
- secure: "P7/kfuDPydkXfxBw5i923LHcr9LPW6treQJHNWVEyEiC+OTqr1tsBqlbNvBp+CRHmFTS5UbXL4bKQ2gCkTQHaXKHBaW3UDOpOGb+VIEdVomuxwoIwu1NwQxO5zYFwd+I1F6iLuDQHGIK47/a5gDDZ8jyrilKGnF0A3LA+9Nh81zfOnPl8SLjQp/tI1kMxnhHfriw9+aSSBb7vARksRrrI8Gsr2Yt9yFGVmtyKRkz03/CowQ+HATKBfqiYCtHnorrujBBl4ajNeUeiY5DbBux3WBqZhFw6ERPuXEMBPPWmLy8TjVt17XxxiJHTrclpVtOG4ZqxbeZCPqDhk0So6nEfZOjcXsCrZFwOici3kN8nxYXRE1qHyfk84mnYz5r9YtlcI/dY5e0gRjEvARE2JQC6e9Txm6WYG9BOMttVl5q3uN1hwykEXOAeDQJEUn78KoeBCmcQLxtH1LmF7u6g0mipzh3bT0drexOJsChvfWMk8AQ0/2h6o2CNOJb10sxRvHGkbjEKr0PNuAeSbY9eIOvKoxjGvTeb1rdJqUbqpPfiS5dUguEPjqfWZA7FCI9yfdJ7UQc2vB/u76frerjNNZHKYA+H+KcG0BHHqCGpBz432/Svp4ZEjCBsdNjkzhruB355zBqUXqI1tHCif54e14qQiyXC54DqxfIkiIBL5c8ZcA="
- secure: "XB4uJIcPKvJ5lEuNUACNZK3k0CTMyxBJB9ChdR+22imUz/KA6E6UCpaZL0Baw3nN3WKjPbymCZ3pRE0GrsjBlgHap/QF3f+wOA83F5CGb13HO4d5tBA2rOvuHRbEZxYRT+5VJLXZHWqfT6YRekYxsAl0OsZo/9I8+KsdzHPaOCPaJPmgDKQMO2K0LUOuOJEs1lZ3DspeE/Pm/mKm8mZGP9Bq7pUjQv9AisacuHHRXhKYprtMubxFUijZ+4sO3qlussc64RWWdDhGwTa7oE4ZNu5H+U/Nfq9sgBR0dzt0rPRAmWaFRyr9AjCTXEIm0IlN6n4gyHGvjUguuEP+AU2ze3zm5s0zBbQLxAeEK8OPwXkGNtclYxMODJJw/IGHq8EXIZirtop45utfCtnya/6WZeYGz92jRBfvVc1kCrMxoDDgRHReKfpRI8htlaxQm+qWzITNom8radaKTHvoVqG0Ods7uzx1OOtxckG7+q/z1jA8NWHbcmPbXal0Y5LcKbNAWr21eRiYe2vgALU+adoHZxzGRNlD+h5wQtjxbqI3WAyOLCWxuy0mfcILl/bpRjz17kovaQatHmLxJpzpJwh4ORJpVwDhTYq5u7CRVavaQeZL5yFP/rkE4p17t/K/lPK46iN+JAp0yjGSVNuIdWn5yTlGTLQgjmBmcR87Nghqhss="
- COMMIT_AUTHOR_EMAIL="psyplot@hzg.de"
- BUILD_STR_END=cf
# github token
- secure: "avtfM/IM75N6kADzVximO5F4vxpIt2YKw0v/ESyQme7b0h2SMOR5Ql6HvXXWqFRQj1Kr7pGrvnPRlCBvQViTOFTsRHSyGsTrBAvdThYiJiWe2VFC7HWvtkmyn7GWO0XNMVS06B/FZgJyj811txvP2wOTeMxe0i9KCI9ao4w07sc5ZXrG+KX8oyOvxqEeGrNStvoH/HAHnLWBjccQ7skwYIavP2WmtzdY1JrKLnSOJEcBuW1LTcGY4f5FPjxAh+jhOYrFVJNajwX37l3BfPvdVEkDdh+MP41z1MNHyhiwVsBGiPoyonnlsoC9zCwTXYlqrTgQc4Ud67kvFYBulLTbU69Uv2+Q8AOMlV+JOrs1aPtAgHpqXkkT208uTCUUTN8vWlRenLvvE06txgzu0v+hb4PjBQcRGZ5XEPOOzArtvDR8deJwqbXya0bwBbny40v706gBQ8VFBF0znKZBN69f/QsRgf7AARMizajHhWoFwiYTf6/vB7iZhXwQaPxl9eePoFdTd/oQ07oouqn/evdNj1312SgE52+RpqiouoGv8IGKQcuOOt/v2jEyeUZM6vpCcfOD32E3VaoqKfqlfyF8VtSTxF5RG+ZpqvRYYAiIpk66ZTwhJwnra+hHH0D7OXD4h4qaM941O58tMVtyFlG0LmgWnm8lG8Sd9HYi3G+zYZ8="
# anaconda token
- secure: "U2+Wwxoogw+Tf/aNx2VUBC+BqUM+03sI6gInXAFeAKCN2THEUmYJhX9zY9S8I0GGiIc5jB2k6fVEu+Wt7RkxJi4MZ9UdA8NaiKo5N6ucArr5/SPz2ZkChSzGKZUv2lCKT/qtGXtI4FHwSc0Nn3Yc8nWSqal24p5W0Ql1cZxSjF2JHetHEIfqY7USMwdokLn+KgMHc+yiUHIryqWb6ERVIWuNnyUjv+W4tYVfOCtIo+IFvRN1Qy9nVueBfglkuDSACWIjeDv8kta3kcGvYjCjl2UrEEkeru5W3IFBu5abFZrK+hXLFTiay89ccydOxn3zXFPWP5QS9QX3C4OBvrIt8SIo+Dze1M5N3J9yAlqUXYAHLBsMJYtTiRfc7aGWEqPHmQVrYQMXb8sYT1k710Spg+kbo40pzziBGT5tQeVlcHzFJrlTj7syBcli3xBMo5ZN1ibS79Lmns9ebKEBf8D52xDYYH3G1OJ09ZtFipJ7zKc/Quno2rleLLSYV+X15rFRqWjQTjQNDOeg6hnv7PYuCoam3qRdI/1gMGD5unJKWt2y9GK1xuUy+kQgjyWmo6AiD/p/Mh/Q1O60rE+iXl+BDCHMvLioeuJBC8oGN3e5zXM0I5dRpgUu7Bb94VKQN0fshMzXO5UDc3vjoEH+v/SClxIdOtTL/v6IFmbBA3krgE0="
matrix:
include:
# linux environments
Expand All @@ -17,6 +20,11 @@ matrix:
- MPL_VERSION=3.1
- DEPLOY_CONDA=true
os: linux
- env:
- PYTHON_VERSION=3.7
- BUILD_STR_END=
- DEPLOY_CONDA=true
os: linux
- env:
- PYTHON_VERSION=3.7
- MPL_VERSION=3.0
Expand All @@ -27,6 +35,11 @@ matrix:
- MPL_VERSION=3.1
- DEPLOY_CONDA=true
os: osx
- env:
- PYTHON_VERSION=3.7
- BUILD_STR_END=
- DEPLOY_CONDA=true
os: osx
- env:
- PYTHON_VERSION=3.7
- MPL_VERSION=3.1
Expand All @@ -42,6 +55,7 @@ services:

git:
submodules: false
depth: false

before_install:
- if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]]; then export DEPLOY_CONDA=false; fi
Expand Down Expand Up @@ -96,13 +110,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
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 matplotlib=${MPL_VERSION} pyqt=${QT_VERSION}
- if [[ $USE_PIP == true ]]; then
Expand All @@ -123,11 +141,11 @@ script:
else
conda build ci/conda-recipe --python $PYTHON_VERSION;
fi
- python ci/check_ref_deploy.py
- if [[ ${BUILD_STR_END} == "cf" ]]; then python ci/check_ref_deploy.py; fi
# 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/psy-maps" ]]; then
- if [[ $DEPLOY_CONDA == "true" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_REPO_SLUG == "psyplot/psy-maps" ]]; then
ci/deploy_anaconda.py;
fi

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ v1.2.0
Added
-----
* The ``mapplot`` plotmethod now also supports unstructured data of any shape
(see `issue#6 <https://github.com/Chilipp/psyplot/issues/6>`__)
(see `issue#6 <https://github.com/psyplot/psyplot/issues/6>`__)

Changed
-------
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
16 changes: 8 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ psy-maps: The psyplot plugin for visualizations on a map
* - docs
- |docs|
* - tests
- |travis| |appveyor| |requires| |coveralls|
- |travis| |appveyor| |requires| |codecov|
* - package
- |version| |conda| |supported-versions| |supported-implementations| |zenodo|

.. |docs| image:: http://readthedocs.org/projects/psy-maps/badge/?version=latest
:alt: Documentation Status
:target: http://psy-maps.readthedocs.io/en/latest/?badge=latest

.. |travis| image:: https://travis-ci.org/Chilipp/psy-maps.svg?branch=master
.. |travis| image:: https://travis-ci.org/psyplot/psy-maps.svg?branch=master
:alt: Travis
:target: https://travis-ci.org/Chilipp/psy-maps
:target: https://travis-ci.org/psyplot/psy-maps

.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/3jk6ea1n4a4dl6vk?svg=true
:alt: AppVeyor
:target: https://ci.appveyor.com/project/Chilipp/psy-maps
:target: https://ci.appveyor.com/project/psyplot/psy-maps

.. |coveralls| image:: https://coveralls.io/repos/github/Chilipp/psy-maps/badge.svg?branch=master
.. |codecov| image:: https://codecov.io/gh/psyplot/psy-maps/branch/master/graph/badge.svg
:alt: Coverage
:target: https://coveralls.io/github/Chilipp/psy-maps?branch=master
:target: https://codecov.io/gh/psyplot/psy-maps

.. |requires| image:: https://requires.io/github/Chilipp/psy-maps/requirements.svg?branch=master
.. |requires| image:: https://requires.io/github/psyplot/psy-maps/requirements.svg?branch=master
:alt: Requirements Status
:target: https://requires.io/github/Chilipp/psy-maps/requirements/?branch=master
:target: https://requires.io/github/psyplot/psy-maps/requirements/?branch=master

.. |version| image:: https://img.shields.io/pypi/v/psy-maps.svg?style=flat
:alt: PyPI Package latest release
Expand Down
22 changes: 12 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@ environment:

PYTHON_ARCH: "64"
PYTHON: "C:\\Miniconda36-x64"
GH_REPO_TOKEN:
secure: AbhjnJXZWHhEiEN6cjQmZ4hCn05Ff/V2CCBv4mZux9NljqdYgHfnVT4nBgsKiaQJ
CONDA_REPO_TOKEN:
secure: vZLY/2JoH+snELbmwc1/Ui1qge943D32tPr1CJV/v4x+e6PRD7YoqMFxwfB0vHxb
COMMIT_AUTHOR_EMAIL: "psyplot@hzg.de"

matrix:
- PYTHON_VERSION: "3.8"
MPL_VERSION: "3.1"
BUILD_STR_END: cf
- PYTHON_VERSION: "3.7"
- PYTHON_VERSION: "3.7"
MPL_VERSION: "3.1"
BUILD_STR_END: cf
- PYTHON_VERSION: "3.7"
MPL_VERSION: "3.0"
BUILD_STR_END: cf
install:
# windows config (for installation)
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- setlocal
- 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) 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
Expand All @@ -31,18 +32,19 @@ install:
- endlocal
- 'SET PYTHONWARNINGS=ignore:mode:DeprecationWarning:docutils.io:245'
- "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (SET GIT_BRANCH=%APPVEYOR_REPO_BRANCH%)"
- "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (conda config --add channels chilipp/label/%APPVEYOR_REPO_BRANCH%)"
- "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (conda config --add channels psyplot/label/%APPVEYOR_REPO_BRANCH%)"
- python ci\\setup_append.py ci\\conda-recipe matplotlib=%MPL_VERSION%
- set PSYPLOT_REFERENCES=%APPVEYOR_BUILD_FOLDER%/tests/reference_figures/win32/py%PYTHON_VERSION%/mpl%MPL_VERSION%
- set REFBRANCH=win32_py%PYTHON_VERSION%_mpl%MPL_VERSION%
- git submodule update --init %PSYPLOT_REFERENCES%
- IF DEFINED MPL_VERSION (set PSYPLOT_REFERENCES=%APPVEYOR_BUILD_FOLDER%/tests/reference_figures/win32/py%PYTHON_VERSION%/mpl%MPL_VERSION%)
- IF DEFINED MPL_VERSION (set REFBRANCH=win32_py%PYTHON_VERSION%_mpl%MPL_VERSION%)
- IF DEFINED PSYPLOT_REFERENCES (git submodule update --init %PSYPLOT_REFERENCES%)

build: off

test_script:
- setlocal
- set CONDA_REPO_TOKEN=
- conda build ci/conda-recipe --python %PYTHON_VERSION%
- IF DEFINED PSYPLOT_REFERENCES (python ci/check_ref_deploy.py)
- endlocal

deploy_script:
Expand Down
4 changes: 2 additions & 2 deletions ci/check_ref_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

maybe_upload = (
(os.getenv('TRAVIS') and os.getenv('TRAVIS_PULL_REQUEST') == 'false' and
os.getenv('TRAVIS_REPO_SLUG') == 'Chilipp/psy-maps') or
os.getenv('TRAVIS_REPO_SLUG') == 'psyplot/psy-maps') or
(os.getenv('APPVEYOR') and
os.getenv('APPVEYOR_REPO_NAME') == 'Chilipp/psy-maps'))
os.getenv('APPVEYOR_REPO_NAME') == 'psyplot/psy-maps'))

if maybe_upload:
os.chdir(get_ref_dir())
Expand Down
8 changes: 4 additions & 4 deletions ci/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package:
version: {{ data.get('version') }}

source:
git_url: ../../
path: ../../

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 %}
script: python -m pip install . --no-deps --ignore-installed -vvv

requirements:
Expand Down Expand Up @@ -43,7 +43,7 @@ test:
- py.test -sv --cov-append --cov=psy_maps

about:
home: https://github.com/Chilipp/psy-maps
home: https://github.com/psyplot/psy-maps
license: GPL-2.0
license_family: GPL
license_file: LICENSE
Expand All @@ -53,4 +53,4 @@ about:
This psyplot plugin uses the cartopy package to visualize geo-referenced
data on a map
doc_url: http://psyplot.readthedocs.io/projects/psy-maps
dev_url: https://github.com/Chilipp/psy-maps
dev_url: https://github.com/psyplot/psy-maps
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
# The cdo example would require the installation of climate data operators
# which is a bit of an overkill
example_gallery_config = dict(
urls='https://github.com/Chilipp/psy-maps/blob/master/examples',
urls='https://github.com/psyplot/psy-maps/blob/master/examples',
)

if on_rtd:
Expand Down
10 changes: 6 additions & 4 deletions docs/environment.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
name: psyplot_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
- dask
- xarray
- netCDF4
Expand Down
Loading