Prepare for new release (#16)

Author: wpreimes

Diff for: .travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: python
 sudo: false
 addons:
@@ -10,8 +11,8 @@ notifications:
 python:
   # We don't actually use the Travis Python, but this keeps it organized.
   - "2.7"
-  - "3.5"
   - "3.6"
+  - "3.7"
 install:
   # You may want to periodically update this, although the conda update
   # conda line below will keep everything up-to-date.  We do this
@@ -33,9 +34,9 @@ install:
   - conda info -a
 
   - conda create -n ecmwf-models python=${TRAVIS_PYTHON_VERSION}
+  - conda env update -f environment.yml -n ecmwf-models
   - source activate ecmwf-models
 
-  - conda env update -f environment.yml
 
   - python setup.py develop
 

Diff for: CHANGES.rst

@@ -2,9 +2,15 @@
 Changelog
 =========
 
-Version 0.X
+Unreleased
+==========
+-
+
+
+Version 0.5
 ===========
 
+- Change default time steps to 6 hours.
 - Add more tests, also for download functions
 - Update documentation, add installation script
 - Fix bugs, update command line interfaces, update dependencies

Diff for: ecmwf_models/era5/download.py

@@ -169,7 +169,8 @@ def download_and_move(target_path, startdate, enddate, variables=None,
 
             except:
                 # delete the partly downloaded data and retry
-                os.remove(dl_file)
+                if os.path.isfile(dl_file):
+                    os.remove(dl_file)
                 finished = False
                 i += 1
                 continue
@@ -229,8 +230,9 @@ def parse_args(args):
                         help=("Keep the originally, temporally downloaded file as it is instread of deleting it afterwards"))
     parser.add_argument("-grb", "--as_grib", type=str2bool, default='False',
                         help=("Download data in grib format, instead of the default netcdf format"))
-    parser.add_argument("--h_steps", type=int, default=None, nargs='+',
-                        help=("Manually change the temporal resolution of downloaded images, must be full hours. "
+    parser.add_argument("--h_steps", type=int, default=[0,6,12,18], nargs='+',
+                        help=("Manually change the temporal resolution of downloaded images."
+                              "Pass a set of full hours here, like '--h_steps 0 12'. "
                               "By default 6H images (starting at 0:00 UTC, i.e. 0 6 12 18) will be downloaded"))
 
     args = parser.parse_args(args)
@@ -256,5 +258,3 @@ def main(args):
 
 def run():
     main(sys.argv[1:])
-
-

Diff for: ecmwf_models/era5/reshuffle.py

@@ -139,8 +139,9 @@ def parse_args(args):
                               "See documentation on image download for resp. ERA products, "
                               "for more information on variable names of the product. "))
     parser.add_argument("--mask_seapoints", type=bool, default=False,
-                        help=("Replace points over water with nan. This option needs the"
-                              "lsm variable in the first file of the image data (mask will be static)."))
+                        help=("Replace points over water with nan. This option needs the "
+                              "LandSeaMask (lsm) variable in the image data (will use mask from first available file). "
+                              "To use a dynamic LSM, reshuffle the LSM variable to time series."))
     parser.add_argument("--h_steps", type=int, default=None, nargs='+',
                         help=("Time steps (full hours) of images that will be reshuffled (must be in the images). "
                               "By default 6H images (starting at 0:00 UTC) will be reshuffled."))

Diff for: ecmwf_models/erainterim/reshuffle.py

@@ -134,8 +134,9 @@ def parse_args(args):
                               "See documentation on image download for resp. ERA products, "
                               "for more information on variable names of the product. "))
     parser.add_argument("--mask_seapoints", type=bool, default=False,
-                        help=("Replace points over water with nan. This option needs the"
-                              "lsm variable in the image data."))
+                        help=("Replace points over water with nan. This option needs the "
+                              "LandSeaMask (lsm) variable in the image data (will use mask from first available file). "
+                              "To use a dynamic LSM, reshuffle the LSM variable to time series."))
     parser.add_argument("--h_steps", type=int, default=None, nargs='+',
                         help=("Time steps (full hours) of images that will be reshuffled (must be in the images). "
                               "By default 6H images (starting at 0:00 UTC) will be reshuffled."))