Skip to content

Commit

Permalink
Merge pull request #50 from TUW-GEO/develop
Browse files Browse the repository at this point in the history
Update pyscaffold v3.2.3
  • Loading branch information
sebhahn committed Apr 29, 2020
2 parents 3e8ed58 + 13ce415 commit 9745592
Show file tree
Hide file tree
Showing 25 changed files with 372 additions and 237 deletions.
9 changes: 7 additions & 2 deletions .coveragerc
@@ -1,8 +1,13 @@
# .coveragerc to control coverage.py
[run]
branch = True
source = pynetcf
omit = */_version.py
source = pynetCF
# omit = bad_file.py

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

[report]
# Regexes for lines to exclude from consideration
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Expand Up @@ -3,39 +3,48 @@
*.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
*.eggs/
.installed.cfg
*.egg-info
*.eggs

# Unittest and coverage
htmlcov/*
.coverage
.tox
junit.xml
coverage.xml
.pytest_cache/

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

# Per-project virtualenvs
.venv*/
10 changes: 3 additions & 7 deletions .travis.yml
Expand Up @@ -4,19 +4,15 @@ notifications:
email: false
python:
# We don't actually use the Travis Python, but this keeps it organized.
- "2.7"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
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;
else
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
Expand Down
8 changes: 4 additions & 4 deletions AUTHORS.rst
@@ -1,6 +1,6 @@
==========
Developers
==========
============
Contributors
============

* Christoph Paulik <christoph.paulik@geo.tuwien.ac.at>
* Sebastian Hahn <sebastian.hahn@geo.tuwien.ac.at>
* Christoph Paulik <cpaulik@vandersat.com>
96 changes: 70 additions & 26 deletions changes.md → CHANGELOG.rst
@@ -1,94 +1,138 @@
## v0.1.19 - 2019-01-08
=========
Changelog
=========

Version 0.2.0
=============

- Package no longer Python 2.7 compatible
- Update pyscaffold v3.2.3
- Remove build_script and changes.md
- Update environment.yml
- Package name changed from pynetCF to pynetcf
- Updating travis settings

Version 0.1.19
==============

- Update readme.
- Remove unnecessary dimensions while reading point data.
- Pin squinx version to fix rtd
- Update netcdf4 requirement to v1.4.2

## v0.1.18 - 2018-03-20
Version 0.1.18
==============

- Update installation to pyscaffold 2.5.x to fix https://github.com/blue-yonder/pyscaffold/issues/148
- Restrict netcdf4 package to versions <=1.2.8 because of https://github.com/Unidata/netcdf4-python/issues/784

## v0.1.17 - 2017-08-22
Version 0.1.17
==============

- Allow writing and reading of PointData in append mode.
- Set default filenames for GriddedPointData to include .nc ending.

## v0.1.16 - 2017-07-07
Version 0.1.16
==============

- Translate RuntimeError of older versions of the netCDF4 library to IOError.
- Avoid race conditions when creating directories for new files.

## v0.1.15 - 2017-06-20
Version 0.1.15
==============

- Fix bug that lost the datatype during writing of timeseries with pandas > 0.17.1
- Fix bug that lost the datatype during writing of timeseries with
pandas > 0.17.1
- Fix Python 3 compability.

## v0.1.14 - 2017-06-20
Version 0.1.14
==============

- fix bug that read the wrong timeseries if a non existing location id was given.
- fix bug when reading not completely filled files in read_bulk mode in contigous ragged.
- fix bug that read the wrong timeseries if a non existing location id was
given.
- fix bug when reading not completely filled files in read_bulk mode in
contigous ragged.

## v0.1.13 - 2017-05-02
Version 0.1.13
==============

- Catch RuntimeError and IOError to be compatible with older netCDF4 versions.
- Fix compression of variables in point_data.

## v0.1.12 - 2017-04-05
Version 0.1.12
==============

- IndexedRaggedTs are now compatible with numpy record arrays and dictionaries.

## v0.1.11 - 2017-04-03
Version 0.1.11
==============

- IndexedRaggedTs.write_ts can now write data for multiple grid points at once.
- Add interface to write a complete cell to GriddedNcIndexedRaggedTs

## v0.1.10 - 2017-01-19
Version 0.1.10
==============

- No changes in functionality
- Fix setup.py for correct installation

## v0.1.9 - 2017-01-19
Version 0.1.9
=============

- Fix n_loc bug
- Add recarray for point data
- Excluding pandas==0.19.0

## v0.1.8 - 2016-07-18
Version 0.1.8
=============

- Deprecate pynetcf.time_series.GriddedTs please use
pynetcf.time_series.GriddedNcTs in the future. Be aware that the __init__
arguments have changed slightly to path, grid, ioclass.

## v0.1.7 - 2016-04-12
Version 0.1.7
=============

- Add support of read/write netCDF point data following CF conventions
- Add support for disabling automatic masking during reading. Useful if the data
has fill values but needs to be scaled to a datatype that does not support NaN
values.

## v0.1.6 - 2016-02-03
Version 0.1.6
=============

- Add support for disabling automatic scaling in base netCDF4 library.
- Add support for dtype conversion before scaling and offset.

## v0.1.5 - 2016-01-27
Version 0.1.5
=============

- Add classes for gridded datasets based on pygeobase
- improve test coverage
- make compatible with newest netCDF4 releases
- support read_bulk keyword for all dataset types

## v0.1.4 - 2015-11-04
Version 0.1.4
=============

- fix open/closing of netCDF file

## v0.1.2 - 2015-08-04
Version 0.1.2
=============

- fixed issue #9

## v0.1.3 - 2015-08-10
- fixed issue #10
Version 0.1.3
=============

## v0.1.1 - 2015-02-19
- fixed issue #4
- fixed issue #10

## v0.1 - 2015-02-18
- moved netcdf classes out of rs data readers
Version 0.1.1
=============

- fixed issue #4

Version 0.1
===========

- moved netcdf classes out of rs data readers
49 changes: 24 additions & 25 deletions LICENSE.txt
@@ -1,27 +1,26 @@
# Copyright (c) 2017, Vienna University of Technology,
# Department of Geodesy and Geoinformation
# All rights reserved.
Copyright (c) 2020, TU Wien, Department of Geodesy and Geoinformation.
All rights reserved.

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * 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.
# * Neither the name of the Vienna University of Technology,
# 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.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of the Vienna University of Technology,
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 VIENNA UNIVERSITY OF TECHNOLOGY,
# 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.
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 VIENNA UNIVERSITY OF TECHNOLOGY,
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.
17 changes: 8 additions & 9 deletions README.rst
Expand Up @@ -2,11 +2,11 @@
pynetcf
=======

.. image:: https://travis-ci.org/TUW-GEO/pynetCF.svg?branch=master
:target: https://travis-ci.org/TUW-GEO/pynetCF
.. image:: https://travis-ci.org/TUW-GEO/pynetcf.svg?branch=master
:target: https://travis-ci.org/TUW-GEO/pynetcf

.. image:: https://coveralls.io/repos/github/TUW-GEO/pynetCF/badge.svg?branch=master
:target: https://coveralls.io/github/TUW-GEO/pynetCF?branch=master
.. image:: https://coveralls.io/repos/github/TUW-GEO/pynetcf/badge.svg?branch=master
:target: https://coveralls.io/github/TUW-GEO/pynetcf?branch=master

.. image:: https://badge.fury.io/py/pynetcf.svg
:target: https://badge.fury.io/py/pynetcf
Expand Down Expand Up @@ -64,8 +64,8 @@ Guidelines

If you want to contribute please follow these steps:

- Fork the pynetCF repository to your account
- make a new feature branch from the pynetCF master branch
- Fork the pynetcf repository to your account
- make a new feature branch from the pynetcf master branch
- 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
Expand All @@ -74,6 +74,5 @@ If you want to contribute please follow these steps:
Note
====

For now please see the tests for examples on how to use the classes.


This project has been set up using PyScaffold 3.2.3. For details and usage
information on PyScaffold see https://pyscaffold.org/.
12 changes: 0 additions & 12 deletions build_script

This file was deleted.

0 comments on commit 9745592

Please sign in to comment.