Commit 1d0b56b4 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed missing dependency for scikit-image.

Updated __version__ and __versioninfo__
parent e5ade8ca
Pipeline #720 passed with stages
in 59 seconds
......@@ -7,8 +7,8 @@ from . import numeric
from . import similarity
from . import web
__version__ = '0.4.2'
__versionalias__ = '20170819_01'
__version__ = '0.4.3'
__versionalias__ = '20170820_01'
__author__='Daniel Scheffler'
# Validate GDAL version
......
......@@ -11,13 +11,13 @@ with open('README.rst') as readme_file:
with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = ['gdal', 'numpy', 'shapely', 'six', 'rasterio', 'geopandas']
requirements = ['gdal', 'numpy', 'shapely', 'six', 'rasterio', 'geopandas', 'scikit-image']
setup_requirements = [] # TODO(danschef): put setup requirements (distutils extensions, etc.) here
test_requirements = requirements + ['coverage']
setup(
name='py_tools_ds',
version='0.4.2',
version='0.4.3',
description="A collection of Python tools by Daniel Scheffler.",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
FROM centos:7
RUN yum update -y && \
yum install -y wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git # TODO
yum install -y wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git
ENV anaconda_dl 'Anaconda3-4.3.1-Linux-x86_64.sh'
RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_dl ; \
......@@ -12,12 +12,11 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes pyqt coverage ; \
conda install --yes -c conda-forge gdal ; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools scikit-image; \
pip install shapely geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse six"
# copy some needed stuff to /root
#COPY *.pkl /root/ # EXAMPLE
#COPY *.h5 /root/ # EXAMPLE
# install git lfs
RUN /bin/bash -i -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment