diff --git a/Dockerfile b/Dockerfile index 990c55f597646eaa17ea7b23c33bbf82442a8bc3..c48a01dcd9daecdfc44cc8abae06635166f75c3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,10 +23,12 @@ RUN if $GUI; then \ ### Python3 links and pip packages RUN ln -s /usr/bin/python3 /usr/local/bin/python && ln -s /usr/bin/pip3 /usr/local/bin/pip +# Upgrade pip +RUN pip install --no-cache-dir pip --upgrade # NumPy version is conflicting with system's gdal dep and may require venv ARG NUMPY_SPEC="==1.22.*" ARG PROTO_SPEC="==3.20.*" -RUN pip install --no-cache-dir -U pip wheel mock six future tqdm deprecated "numpy$NUMPY_SPEC" "protobuf$PROTO_SPEC" \ +RUN pip install --no-cache-dir -U wheel mock six future tqdm deprecated "numpy$NUMPY_SPEC" "protobuf$PROTO_SPEC" \ && pip install --no-cache-dir --no-deps keras_applications keras_preprocessing # ---------------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 3a95ac4a7a80f85a25389af04ad8b44b27295aa9..9725b146f8006505140c2466840e15e0b45f32fc 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setuptools.setup( name="otbtf", - version="0.1", + version="3.3.0", author="Remi Cresson", author_email="remi.cresson@inrae.fr", description="OTBTF: Orfeo ToolBox meets TensorFlow", @@ -27,4 +27,4 @@ setuptools.setup( packages=setuptools.find_packages(), python_requires=">=3.6", keywords="remote sensing, otb, orfeotoolbox, orfeo toolbox, tensorflow, tf, deep learning, machine learning", -) \ No newline at end of file +)