Skip to content

Commit

Permalink
0.13.2 (#102) (Closes #98)
Browse files Browse the repository at this point in the history
This PR makes GIS4WRF available for download in QGIS 3.4.x as the bug with pip has been fixed (see https://issues.qgis.org/issues/20249) and QGIS3.4.1 has been made available for download. I have also changed slightly changed the logic for installing package dependencies based on the Python version used and use Python 3.6 in Travis CI.
  • Loading branch information
dmey authored Nov 8, 2018
1 parent c36aae0 commit 550ce0f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ before_install:
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
- conda create -q -n test-environment python=3 numpy gdal requests pytest
- conda create -q -n test-environment python=3.6 numpy gdal requests pytest
- source activate test-environment

script:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.13.2
- Remove restriction of QGIS max version 3.2.x due to QGIS bug (#98).
- Update wrf-python wheel URLs for Windows to Python 3.7 (#100).
- Add workaround for Python 3.7.0 bug in subprocess on Windows (#101)

0.13.1
- Momentarily limit GIS4WRF installation to QGIS max version 3.2.x due to QGIS bug (#98).
- Automatically tick MPI checkbox if mpich is detected on the system (#82).
Expand Down
33 changes: 22 additions & 11 deletions gis4wrf/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
#Dependency('xarray', install='0.10.0', min=None),
Dependency('f90nml', install='1.0.2', min=None),
Dependency('pyyaml', install='3.13', min=None),
# >= 1.3.0 is built against too recent numpy version
Dependency('netCDF4', install='1.2.9', min=None),

# Indirect dependencies.
# Indirect dependencies are dependencies that we don't import directly in our code but
Expand All @@ -58,21 +56,34 @@
# https://github.com/pandas-dev/pandas/issues/18967
#Dependency('pandas', install='0.20.3', min=None) # for xarray
]
# wrf-python does not have official wheels yet, see https://github.com/NCAR/wrf-python/issues/42.
# For some packages we need to use different versions depending on the Python version used.
# Also, wrf-python does not have official wheels yet, see https://github.com/NCAR/wrf-python/issues/42.
# Instead, at least for Windows, we install our own.
# macOS/Linux wheels are built via Travis CI which doesn't provide free artifact storage.
if platform.system() == 'Windows':
if PY_MAJORMINOR == ('3', '6'):
if PY_MAJORMINOR == ('3', '6'):
DEPS += [
# NetCDF4 >= 1.3.0 is built against too recent numpy version.
Dependency('netCDF4',
install='1.2.9',
min='None'),
]
if platform.system() == 'Windows':
DEPS += [
Dependency('wrf-python',
install='https://ci.appveyor.com/api/buildjobs/sj9br4xl885ncidm/artifacts/wrf_python-1.1.2-cp36-cp36m-win_amd64.whl',
min='1.1.2'),
install='https://ci.appveyor.com/api/buildjobs/sj9br4xl885ncidm/artifacts/wrf_python-1.1.2-cp36-cp36m-win_amd64.whl',
min='1.1.2'),
]
elif PY_MAJORMINOR == ('3', '7'):
elif PY_MAJORMINOR == ('3', '7'):
DEPS += [
Dependency('netCDF4',
install='1.4.2',
min='None'),
]
if platform.system() == 'Windows':
DEPS += [
Dependency('wrf-python',
install='https://ci.appveyor.com/api/buildjobs/o3ow5itmyi8nhhk2/artifacts/wrf_python-1.1.2-cp37-cp37m-win_amd64.whl',
min='1.1.2'),
install='https://ci.appveyor.com/api/buildjobs/o3ow5itmyi8nhhk2/artifacts/wrf_python-1.1.2-cp37-cp37m-win_amd64.whl',
min='1.1.2'),
]

# Use a custom folder for the packages to avoid polluting the per-user site-packages.
Expand Down Expand Up @@ -147,7 +158,7 @@ def bootstrap() -> Iterable[Tuple[str,Any]]:

except pkg_resources.DistributionNotFound as exc:
needs_install.append(dep)

if needs_install:
yield ('needs_install', needs_install)
yield ('log', 'Package directory: ' + INSTALL_PREFIX)
Expand Down
3 changes: 1 addition & 2 deletions gis4wrf/metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ tracker=https://github.com/GIS4WRF/gis4wrf/issues
tags=WRF, WPS, GIS, NetCDF, GRIB, NWP, weather, atmospheric science, atmospheric modelling, plotting
icon=plugin/resources/gis4wrf_logo.svg

qgisMinimumVersion=3.0
qgisMaximumVersion=3.2
qgisMinimumVersion=3.0

0 comments on commit 550ce0f

Please sign in to comment.