Skip to content

Commit

Permalink
add version to wheel filename for pip>=24.1
Browse files Browse the repository at this point in the history
  • Loading branch information
danbryce committed Aug 2, 2024
1 parent 99a97ab commit 0ec2f15
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ RUN pip install --no-cache-dir fastapi>=0.103.1
RUN pip install --no-cache-dir --upgrade setuptools pip
RUN pip install --no-cache-dir wheel

# RUN pip install /dreal4/dreal-*.whl
RUN pip install /dreal4/dreal-*.whl

CMD [ "/bin/bash" ]
2 changes: 1 addition & 1 deletion docker/dev/root/Dockerfile.root
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ WORKDIR /root
RUN pip install --no-cache-dir z3-solver
RUN pip install --no-cache-dir graphviz

# RUN pip install /dreal4/dreal-*.whl
RUN pip install /dreal4/dreal-*.whl

# Install funman dev packages
COPY . funman
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/user/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ WORKDIR /home/$UNAME
RUN pip install --no-cache-dir z3-solver
RUN pip install --no-cache-dir graphviz

# RUN pip install /dreal4/dreal-*.whl
RUN pip install /dreal4/dreal-*.whl

# Install funman dev packages
COPY --chown=$UID:$GID . funman
Expand Down
5 changes: 3 additions & 2 deletions docker/dreal4/Dockerfile.dreal4
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,11 @@ RUN cd /dreal4 \
&& bazel build //:archive \
&& tar xfz bazel-bin/archive.tar.gz --strip-components 3 -C /usr \
# Install Python3 Binding
&& pip3 install wheel \
&& pip3 install --upgrade wheel \
&& pip3 install --upgrade setuptools \
&& pip3 install --upgrade pip \
&& python3 setup.py bdist_wheel \
&& DREAL_WHEEL=dreal-*-cp38-none-manylinux_$(ldd --version | grep '^ldd' | sed -E 's/^ldd.*([0-9]+)\.([0-9]+)$/\1_\2/')_$(arch).whl \
&& DREAL_WHEEL=dreal-$(python setup.py --version)-cp38-none-manylinux_$(ldd --version | grep '^ldd' | sed -E 's/^ldd.*([0-9]+)\.([0-9]+)$/\1_\2/')_$(arch).whl \
&& cp ./dist/$DREAL_WHEEL /tmp/$DREAL_WHEEL \
&& pip3 install ./dist/$DREAL_WHEEL \
&& bazel clean --expunge \
Expand Down

0 comments on commit 0ec2f15

Please sign in to comment.