diff --git a/Dockerfile b/Dockerfile index a029889..2d4a605 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,13 @@ # Pull base image. We start from the mambaforge image FROM condaforge/mambaforge -MAINTAINER Simon Mudd (simon.m.mudd@ed.ac.uk) and Boris Gailleton (b.gailleton@sms.ed.ac.uk) +MAINTAINER Simon Mudd (simon.m.mudd@ed.ac.uk) # Need this to shortcut the stupid tzdata noninteractive thing ARG DEBIAN_FRONTEND=noninteractive # We need to change the python version -RUN mamba install -y python=3.8 +RUN mamba install -y python=3.9 # We need some stuff to get lsdtopytools to install RUN apt-get update && apt-get install -y \ @@ -21,9 +21,6 @@ RUN apt-get update && apt-get install -y \ libfftw3-dev \ && rm -rf /var/lib/apt/lists/* - - - # Some tools for fetching data RUN mamba install -y wget unzip @@ -46,13 +43,13 @@ RUN mamba install -y ipython ipykernel jupyter jupyter-book RUN mamba install -y gdal rasterio geopandas matplotlib numpy scipy pytables numba feather-format pandas pip pybind11 xtensor xtensor-python fiona utm pyproj cartopy folium h5py descartes # Add viztools and paramselector -RUN pip install lsdviztools==0.4.8 lsdttparamselector +RUN pip install lsdviztools==0.4.11 lsdttparamselector # Add lsdtopytools -RUN mamba install -y lsdtt-xtensor-python +#RUN mamba install -y lsdtt-xtensor-python # Add lsdtopytools -RUN mamba install -y lsdtopytools +#RUN mamba install -y lsdtopytools # Set the working directory WORKDIR /LSDTopoTools diff --git a/readme.md b/readme.md index 2f957e7..e2a2553 100644 --- a/readme.md +++ b/readme.md @@ -14,6 +14,14 @@ The package also includes a python geospatial stack: It also allows some command line processing with GDAL. See some tips for using the GDAL command line tools here: https://lsdtopotools.github.io/LSDTT_documentation/LSDTT_introduction_to_geospatial_data.html#_gdal +## Versions + +**IMPORTANT** + +The current version of this container, with the `latest` and `v0.7` tags, runs on python 3.9, in order to give compatibilty with google colab. However, `lsdtopytools` currently does not function in this environment. + +If you wish to use `lsdtopytools` you need to use `v0.6` or earlier. + ## Instructions ### Installing Docker