From 5b713d8e5f47d0ad0e2134a062d607e650d1ca80 Mon Sep 17 00:00:00 2001 From: forrest collman Date: Mon, 31 Jul 2017 07:41:31 -0700 Subject: [PATCH 1/2] changing order of base --- Dockerfile.base | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index fb9a4391..98898ba4 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -52,25 +52,18 @@ ENV PATH /opt/conda/bin:$PATH RUN apt-get update RUN apt-get install gcc build-essential libgeos-dev imagemagick -y RUN apt-get install python-setuptools python-dev -y +RUN apt-get install libspatialindex-dev -y +RUN apt-get install nano -y + #RUN apt-get install libblas-dev liblapack-dev -y RUN apt-get clean - -#install components for common render-python apps -#jupyter notebook, shapely with geos -# RUN /opt/conda/bin/conda install jupyter -y - - -#RUN easy_install pip -#RUN pip install -U pip setuptools -RUN pip install shapely==1.6b2 -RUN pip install opencv-python -RUN pip install dill==0.2.6 -RUN pip install multiprocess==0.70.5 -RUN pip install pathos==0.2.0 -RUN pip install pillow +RUN pip install dill==0.2.6, multiprocess==0.70.5, pathos==0.2.0 RUN conda install scipy +RUN conda install jupyter +RUN pip install tifffile, opencv-python, pandas, matplotlib, networkx, shapely==1.6b2, rtree, pillow RUN pip install setuptools --upgrade --disable-pip-version-check + RUN mkdir -p /usr/local/render-python COPY . /usr/local/render-python WORKDIR /usr/local/render-python From 195dcadf6618689462a4bbc07391723665a87e96 Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Wed, 2 Aug 2017 08:39:57 -0700 Subject: [PATCH 2/2] incrementing version and fixing dockerfile.base --- Dockerfile.base | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index 98898ba4..6463a868 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -58,10 +58,10 @@ RUN apt-get install nano -y #RUN apt-get install libblas-dev liblapack-dev -y RUN apt-get clean -RUN pip install dill==0.2.6, multiprocess==0.70.5, pathos==0.2.0 +RUN pip install dill==0.2.6 multiprocess==0.70.5 pathos==0.2.0 RUN conda install scipy RUN conda install jupyter -RUN pip install tifffile, opencv-python, pandas, matplotlib, networkx, shapely==1.6b2, rtree, pillow +RUN pip install tifffile opencv-python pandas matplotlib networkx shapely==1.6b2 rtree pillow RUN pip install setuptools --upgrade --disable-pip-version-check RUN mkdir -p /usr/local/render-python diff --git a/setup.py b/setup.py index 47eb4e10..c45f71a3 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def run_tests(self): required = f.read().splitlines() setup(name='render-python', - version='1.0', + version='1.1.0', description=' a python API to interact via python with render ' 'databases see https://github.com/saalfeldlab/render', author='Forrest Collman, Russel Torres, Eric Perlman, Sharmi Seshamani',