diff --git a/Dockerfile b/Dockerfile index 72f3376..6c3feba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /opt/msspec/code WORKDIR /opt/msspec/code # Fetch the code -RUN git clone --branch devel https://git.ipr.univ-rennes1.fr/epsi/msspec_python3.git . +RUN git clone https://git.ipr.univ-rennes1.fr/epsi/msspec_python3.git . #COPY --chown=msspec:msspec . . # Install msspec diff --git a/Makefile b/Makefile index 5f1419a..a3d284a 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,12 @@ pybinding: venv: ifeq ($(NO_VENV),0) @virtualenv --python=$(PYTHON_EXE) --prompt="(msspec-$(VERSION)) " $(VENV_PATH) - $(INSIDE_VENV) wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py && pip install -r src/pip.freeze && rm -f get-pip.py + $(INSIDE_VENV) \ + wget https://bootstrap.pypa.io/get-pip.py && \ + python get-pip.py && \ + pip install --upgrade setuptools && \ + pip install -r src/pip.freeze && \ + rm -f get-pip.py endif