Skip to content

Commit

Permalink
Update pyscaffold to v3.2.3 (#63)
Browse files Browse the repository at this point in the history
* Update environment.yml
* Update pyscaffold v3.2.3
* Update license to mit
* Remove html_theme_options from sphinx theme
* Update travis settings
  • Loading branch information
sebhahn authored Apr 29, 2020
1 parent 4c96576 commit 83f02bc
Show file tree
Hide file tree
Showing 27 changed files with 318 additions and 340 deletions.
7 changes: 6 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
[run]
branch = True
source = pygeogrids
omit = */_version.py
# omit = bad_file.py

[paths]
source =
src/
*/site-packages/

[report]
# Regexes for lines to exclude from consideration
Expand Down
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,24 @@
*.py[cod]
*.so
*.cfg
!.isort.cfg
!setup.cfg
*.orig
*.log
*.pot
__pycache__/*
.cache/*
.*.swp
*/.ipynb_checkpoints/*
.DS_Store

# Project files
.ropeproject
.project
.pydevproject
.settings
.idea
tags

# Package files
*.egg
Expand All @@ -30,15 +34,17 @@ htmlcov/*
.tox
junit.xml
coverage.xml
.pytest_cache/

# Build and docs folder/files
build/*
dist/*
sdist/*
docs/api/*
docs/_rst/*
docs/_build/*
cover/*
MANIFEST

# ignore local scripts
local_scripts/*
# Per-project virtualenvs
.venv*/
16 changes: 5 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
dist: xenial
language: python
sudo: false
notifications:
email: false
python:
# We don't actually use the Travis Python, but this keeps it organized.
- "2.7"
- "3.6"
- "3.7"
- "3.8"
env:
- PINNED=true # use fixed dependencies
- PINNED=false # use latest dependencies
matrix:
exclude:
- python: "3.7"
env: PINNED=true
- python: "3.8"
env: PINNED=false
install:
# You may want to periodically update this, although the conda update
# conda line below will keep everything up-to-date. We do this
# conditionally because it saves us some downloading if the version is
# the same.
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
pinned_yml=environment_pinned_py2.yml;
else
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
pinned_yml=environment_pinned_py3.yml;
fi
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- pinned_yml=environment_pinned_py3.yml;
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
Expand Down
6 changes: 6 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
============
Contributors
============

* Sebastian Hahn <sebastian.hahn@geo.tuwien.ac.at>
* Christoph Paulik <cpaulik@vandersat.com>
68 changes: 34 additions & 34 deletions CHANGES.rst → CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
Changelog
=========

v0.2.7
======
Version 0.2.7
=============

- Add k parameter to nearest neighbor search (number of nearest neighbors to return)

v0.2.6
======
Version 0.2.6
=============

- Allow subsetting from non-binary masks
- Fix ParallelArcDist function (two calls of deg2rad(lat))
- Update readme
- Update to PyScaffold 2.5.9

v0.2.5
======
Version 0.2.5
=============

- Fix speed bug of gpi2cell
- Update copyright header

v0.2.4
======
Version 0.2.4
=============

- Add option to subset a grid with a shape file (OGRGeometry) in
get_shp_grid_points.
Expand All @@ -32,25 +32,25 @@ v0.2.4
- Ensure that `get_bbox_grid_points` returns points while taking cell order into
account.

v0.2.3
======
Version 0.2.3
=============

- Fix bug in calc_lut in case of differently ordered subset of a grid.
- Add function to reorder grid based on different cell size. (See grids.reorder_to_cellsize)

v0.2.2
======
Version 0.2.2
=============

- Add option to load grids with non standard variable name for gpis.

v0.2.1
======
Version 0.2.1
=============

- Fix bug in gpi2lonlat with subset, see #42
- Add simple script for plotting a global cell partitioning.

v0.2.0
======
Version 0.2.0
=============

- fix bug in storing/loading grids with shape attribute set.
- change equality check of grids to be more flexible. Now only a match of the
Expand All @@ -61,57 +61,57 @@ v0.2.0
function produced grids with wrong lon2d, lat2d arrays because the shape was
not correct

v0.1.9
======
Version 0.1.9
=============

- bugfix in lonlat2cell. Improvements in dependency installation and
documentation.

v0.1.7
======
Version 0.1.7
=============

- bugfix in gpi2lonlat. Now supports array as input.

v0.1.6
======
Version 0.1.6
=============

- add geodatic datum functionality to grid objects

v0.1.5
======
Version 0.1.5
=============

- bugfix of subgrid creation which returned wrongly shaped subarrays

v0.1.4
======
Version 0.1.4
=============

- fix bug in lookuptable generation when gpis have custom ordering
- add functions for getting subgrids from cells and gpis

v0.1.3
======
Version 0.1.3
=============

- change meaning and rename grid dimensions to lon2d, lat2d. They do
now represent 2d arrays of latitudes and longitudes which means that
they no longer have to be regular in order to be able to have a
shape. This is useful for e.g. orbit data

v0.1.2
======
Version 0.1.2
=============

- fix issue #19 by refactoring the iterable checking into own function
- made pykdtree an optional requirement see issue #18

v0.1.1
======
Version 0.1.1
=============

- added support for saving more subsets and loading a certain one
in/from a netcdf grid file
- fix #15 by setting correct shape for derived cell grids
- fix issue #14 of gpi2rowcol input types

v0.1
====
Version 0.1
===========

- Initial version pulled out of pytesmo
- added support for iterables like lists and numpy arrays to functions
Expand Down
42 changes: 17 additions & 25 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
Copyright (c) 2018, TU Wien, Department of Geodesy and Geoinformation
All rights reserved.
MIT License

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Copyright (c) 2020 TU Wien

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

* Neither the name of TU Wien, Department of Geodesy and Geoinformation
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL TU WIEN, DEPARTMENT OF GEODESY AND
GEOINFORMATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 7 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,10 @@ If you want to contribute please follow these steps:
- Add your feature
- Please include tests for your contributions in one of the test directories.
We use py.test so a simple function called test_my_feature is enough
- submit a pull request to our master branch
- submit a pull request to our master branch

Note
====

This project has been set up using PyScaffold 3.2.3. For details and usage
information on PyScaffold see https://pyscaffold.org/.
Loading

0 comments on commit 83f02bc

Please sign in to comment.