Merge pull request #14 from wpreimes/develop

Preparation for new release

Author: wpreimes

Diff for: .gitattributes

@@ -1 +1 @@
-pygeobase/_version.py export-subst
+pygeobase/_version.py export-subst

Diff for: README.rst

@@ -37,19 +37,34 @@ You can find additional information regarding DOI versioning at http://help.zeno
 Installation
 ============
 
-For installation we recommend `Miniconda
-<http://conda.pydata.org/miniconda.html>`_. So please install it according to
-the official installation instructions. As soon as you have the ``conda``
+Install required C-libraries via conda. For installation we recommend
+`Miniconda<http://conda.pydata.org/miniconda.html>`_. So please install it according
+to the official installation instructions. As soon as you have the ``conda``
 command in your shell you can continue.
 
-The following script will download and install all the needed packages.
+.. code::
+
+    conda install -c conda-forge pygrib netcdf4=1.2.2
+
+The following command will download and install all the needed pip packages as well
+as the ecmwf-model package itself.
 
 .. code::
 
-    conda env create -f environment.yml
-    source activate ecmwf-models
     pip install ecmwf_models
 
+To create a full development environment with conda, the environment.yml file
+in this repository can be used.
+
+.. code::
+
+    git clone [email protected]:TUW-GEO/ecmwf_models.git ecmwf_models
+    cd ecmwf_models
+    conda create -n ecmwf-models python=2.7 # or any other supported version
+    conda env update -f environment.yml
+    source activate ecmwf-models
+    python setup.py develop
+
 This script should work on Linux or OSX and uses the ``environment.yml`` file
 included in this repository. On Windows the reading of grib files is not
 available at the moment. On Windows a solution would be to download the ECMWF

Diff for: ecmwf_models/__init__.py

@@ -3,4 +3,4 @@
 try:
     __version__ = pkg_resources.get_distribution(__name__).version
 except:
-    __version__ = 'unknown'
+    __version__ = 'unknown'

Diff for: ecmwf_models/download.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # The MIT License (MIT)
 #
 # Copyright (c) 2018, TU Wien
@@ -27,7 +28,12 @@
 from ecmwfapi import ECMWFDataServer
 import argparse
 import sys
-import pygrib
+import warnings
+try:
+    import pygrib
+except ImportError:
+    warnings.warn("pygrib has not been imported")
+
 import os
 from datetime import datetime, timedelta
 import xarray as xr

Diff for: environment.yml

@@ -1,7 +1,6 @@
-#this file is not used at the moment
 name: ecmwf-models
 channels:
-  - conda-forge
+- conda-forge
 dependencies:
 - numpy
 - matplotlib

Diff for: requirements.txt

@@ -1,7 +1,7 @@
 # Add your requirements here like:
 # numpy
 # scipy>=0.9
-numpy
+numpy>=1.15.4
 pandas
 scipy
 configobj
@@ -16,6 +16,4 @@ pygeobase
 repurpose
 pytesmo
 pynetcf
-configobj
-
-
+configobj

Diff for: setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecmwf_models
-summary = Add a short description here!
+summary = Downloading, reading and TS conversion of ECMWF reanalysis data
 author = Christoph Paulik
 author-email = [email protected]
 license = mit

Diff for: test-requirements.txt

@@ -2,4 +2,5 @@
 # They will be installed automatically when running `python setup.py test`.
 # ATTENTION: Don't remove pytest-cov and pytest as they are needed.
 pytest-cov
-pytest
+coverage==4.5.2
+pytest