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/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:).
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ env:
- PYTHON_VERSION=3.8 USE_PIP=true
# python 3.7
- PYTHON_VERSION=3.7 DEPLOY_CONDA=true
- 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: "XUhVE/QHgOl6uhPpKJ6Kn0POurK719Vly0xeuK9giTz+kpAFcC5b88S2PtaL/BnW+TgV2LxdoKiEqZy1rhhjLfo/8tktiAK2N774HTxbVFVGztgwbqL8u+5FFTMAfDKT7F0R2qvF5/xAGU3tAVEMgkbhc2ZreXO+ah/ndCYo2YVe5SfEw6rkqZErgqJUSZSddxVQ6J6Mz6Mh1fIYZxu1kKJN2uGNNfQGcnt4MpVAdepSjmtUkgPQ6oszwhX34UzJWn5wQCSJDBNpKSgo2WTGy4PVgDNaI/SeEPdKmNSKwfeiBwsojdK5CBL3w2QatwHMpRtBPdsi3l3qJGE/c36Zzrc8Zk5LqTQt/5IVLRZdH4OUZW8a3X/RILsMFzQ8FhJRzimzhkZqdlZFbBc90qed3TmiZUVMjkFMG3+/b4tyy6Oe37e3EzV06Fa/hAF7iS2kmEobCvSUT4kLYxIid7vpo79HjHukudiHMxJYWdBbnal1C3fAs7TZOX08ZOzIsU5wUz8bEjnmso0F4kjxU43q3+Kq/wIlV0Mz2azAv8ZOdm0nswJYILe0LJLl/JMRJ9TvekNuYGe/2dK4AimZYJD5fpdkS00kPHNi6lmqfOdqODXkU+HFm7EO3QuHBuoI8fsraInpDx+1nyqIvKG5wGDn57TiMNLE9JQInzl6A2t55sc="

global:
- 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
Expand Down Expand Up @@ -90,13 +92,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 xarray=${XARRAY_VERSION}
- if [[ $USE_PIP == true ]]; then
Expand Down
10 changes: 5 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Removed
Changed
-------
* We generalized the handling of unstructured data as lined out in
`issue#6 <https://github.com/Chilipp/psyplot/issues/6>`__. The new method
`issue#6 <https://github.com/psyplot/psyplot/issues/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
also the example on the
`visualization of unstructured grids <https://psyplot.readthedocs.io/projects/psy-maps/en/master/examples/example_ugrid.html#gallery-examples-example-ugrid-ipynb>`__
* We removed the inplace parameter for the CFDecoder methods since it is
deprecated with xarray 0.12 (see
`issue #8 <https://github.com/Chilipp/psyplot/issues/8>`__). The
`issue #8 <https://github.com/psyplot/psyplot/issues/8>`__). The
``CFDecoder.decode_ds`` method now always decodes inplace

v1.1.0
Expand Down Expand Up @@ -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
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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?

Expand Down Expand Up @@ -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?

Expand Down
24 changes: 12 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,21 +21,21 @@ 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/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
: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
Expand All @@ -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
Expand All @@ -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 <https://github.com/Chilipp/psyplot>`__ (see also
on `GitHub <https://github.com/psyplot/psyplot>`__ (see also
`How to contribute`_ in the docs).

.. _psyplot-gui: http://psyplot.readthedocs.io/projects/psyplot-gui/en/latest
Expand Down
9 changes: 6 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -16,8 +19,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) 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 @@ -26,7 +29,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
Expand Down
7 changes: 6 additions & 1 deletion ci/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
script: python -m pip install . --no-deps --ignore-installed -vvv
entry_points:
- psyplot = psyplot.__main__:main
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)

Expand Down
24 changes: 12 additions & 12 deletions docs/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Code of Conduct
---------------

This project and everyone participating in it is governed by the
`psyplot Code of Conduct <https://github.com/Chilipp/psyplot/blob/master/CODE_OF_CONDUCT.md>`__.
`psyplot Code of Conduct <https://github.com/psyplot/psyplot/blob/master/CODE_OF_CONDUCT.md>`__.
By participating, you are expected to uphold this code.

What should I know before I get started?
Expand All @@ -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 <https://github.com/Chilipp/psyplot-gui/issues>`__:
- `psyplot-gui <https://github.com/psyplot/psyplot-gui/issues>`__:
Everything specific to the graphical user interface
- `psy-simple <https://github.com/Chilipp/psy-simple/issues>`__:
- `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/Chilipp/psy-maps/issues>`__: Everything
- `psy-maps <https://github.com/psyplot/psy-maps/issues>`__: Everything
concerning, e.g. the ``mapplot``, ``mapvector`` ``mapcombined`` plot
methods
- `psy-reg <https://github.com/Chilipp/psy-reg/issues>`__: Everything
- `psy-reg <https://github.com/psyplot/psy-reg/issues>`__: Everything
concerning, e.g. the ``linreg`` or ``densityreg`` plot methods
- `psyplot <https://github.com/Chilipp/psyplot/issues>`__: Everything
- `psyplot <https://github.com/psyplot/psyplot/issues>`__: Everything
concerning the general framework, e.g. data handling, parallel
update, etc.

Expand All @@ -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 <https://github.com/Chilipp/psyplot/issues>`__.
`psyplot <https://github.com/psyplot/psyplot/issues>`__.

How Can I Contribute?
---------------------
Expand All @@ -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 <https://github.com/Chilipp/psyplot/issues/new>`__, the information it asks for
template <https://github.com/psyplot/psyplot/issues/new>`__, the information it asks for
helps us resolve issues faster.

**Note:** If you find a **Closed** issue that seems like it is the
Expand All @@ -84,7 +84,7 @@ Bugs are tracked as `GitHub
issues <https://guides.github.com/features/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 <https://github.com/Chilipp/psyplot/issues/new>`__.
information by filling in `the template <https://github.com/psyplot/psyplot/issues/new>`__.

Explain the problem and include additional details to help maintainers
reproduce the problem:
Expand Down Expand Up @@ -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 <https://github.com/Chilipp/psyplot/issues/new?template=change_feature.md&title=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/Chilipp/psyplot/issues/new?template=new_feature.md&title=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?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -171,7 +171,7 @@ and provide the following information:
Pull Requests
~~~~~~~~~~~~~

- Fill in `the required template <https://github.com/Chilipp/psyplot/blob/master/.github/PULL_REQUEST_TEMPLATE.md>`__
- Fill in `the required template <https://github.com/psyplot/psyplot/blob/master/.github/PULL_REQUEST_TEMPLATE.md>`__
- Do not include issue numbers in the PR title
- Include screenshots and animated GIFs in your pull request whenever
possible.
Expand Down
12 changes: 7 additions & 5 deletions docs/environment.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
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
- matplotlib=3.0.*
- matplotlib
- seaborn
- ipython
- nbconvert
Expand Down
Loading