From b39ba9ad42ff4570e1aaf06d43b268e7b8c0d95b Mon Sep 17 00:00:00 2001 From: Dan Bryce Date: Thu, 1 Aug 2024 23:18:57 -0500 Subject: [PATCH 1/4] fix docker build --- docker/dev/root/Dockerfile.root | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dev/root/Dockerfile.root b/docker/dev/root/Dockerfile.root index c77e3cf2..ee9e2ece 100644 --- a/docker/dev/root/Dockerfile.root +++ b/docker/dev/root/Dockerfile.root @@ -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 From 99a97ab286d0570c3cc822fe6b6d2bb361266b0d Mon Sep 17 00:00:00 2001 From: Dan Bryce Date: Fri, 2 Aug 2024 07:34:38 -0500 Subject: [PATCH 2/4] fix docker build --- docker/base/Dockerfile | 2 +- docker/dev/user/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 689938dc..7f0f68f2 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -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" ] diff --git a/docker/dev/user/Dockerfile b/docker/dev/user/Dockerfile index 19f1c636..34251f16 100644 --- a/docker/dev/user/Dockerfile +++ b/docker/dev/user/Dockerfile @@ -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 From 0ec2f154ed0c0611de95d1d6f485997dca567d59 Mon Sep 17 00:00:00 2001 From: Dan Bryce Date: Fri, 2 Aug 2024 14:25:45 -0500 Subject: [PATCH 3/4] add version to wheel filename for pip>=24.1 --- docker/base/Dockerfile | 2 +- docker/dev/root/Dockerfile.root | 2 +- docker/dev/user/Dockerfile | 2 +- docker/dreal4/Dockerfile.dreal4 | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 7f0f68f2..689938dc 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -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" ] diff --git a/docker/dev/root/Dockerfile.root b/docker/dev/root/Dockerfile.root index ee9e2ece..c77e3cf2 100644 --- a/docker/dev/root/Dockerfile.root +++ b/docker/dev/root/Dockerfile.root @@ -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 diff --git a/docker/dev/user/Dockerfile b/docker/dev/user/Dockerfile index 34251f16..19f1c636 100644 --- a/docker/dev/user/Dockerfile +++ b/docker/dev/user/Dockerfile @@ -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 diff --git a/docker/dreal4/Dockerfile.dreal4 b/docker/dreal4/Dockerfile.dreal4 index ea6dbce1..7be71dcb 100644 --- a/docker/dreal4/Dockerfile.dreal4 +++ b/docker/dreal4/Dockerfile.dreal4 @@ -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 \ From c739312f2387ecfa04d43308e987f90b9726efb4 Mon Sep 17 00:00:00 2001 From: Daniel Bryce Date: Fri, 2 Aug 2024 19:45:16 +0000 Subject: [PATCH 4/4] bump version --- .../funman_benchmarks/src/funman_benchmarks/_version.py | 2 +- auxiliary_packages/funman_demo/src/funman_demo/_version.py | 2 +- auxiliary_packages/funman_dreal/src/funman_dreal/_version.py | 2 +- auxiliary_packages/pde2petri/src/pde2petri/_version.py | 2 +- src/funman/_version.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auxiliary_packages/funman_benchmarks/src/funman_benchmarks/_version.py b/auxiliary_packages/funman_benchmarks/src/funman_benchmarks/_version.py index 3bca77a1..6adb2512 100644 --- a/auxiliary_packages/funman_benchmarks/src/funman_benchmarks/_version.py +++ b/auxiliary_packages/funman_benchmarks/src/funman_benchmarks/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.9.0" +__version__ = "1.9.1" diff --git a/auxiliary_packages/funman_demo/src/funman_demo/_version.py b/auxiliary_packages/funman_demo/src/funman_demo/_version.py index 3bca77a1..6adb2512 100644 --- a/auxiliary_packages/funman_demo/src/funman_demo/_version.py +++ b/auxiliary_packages/funman_demo/src/funman_demo/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.9.0" +__version__ = "1.9.1" diff --git a/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py b/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py index 3bca77a1..6adb2512 100644 --- a/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py +++ b/auxiliary_packages/funman_dreal/src/funman_dreal/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.9.0" +__version__ = "1.9.1" diff --git a/auxiliary_packages/pde2petri/src/pde2petri/_version.py b/auxiliary_packages/pde2petri/src/pde2petri/_version.py index 0a0a43a5..38cf6dbe 100644 --- a/auxiliary_packages/pde2petri/src/pde2petri/_version.py +++ b/auxiliary_packages/pde2petri/src/pde2petri/_version.py @@ -1 +1 @@ -__version__ = "1.9.0" +__version__ = "1.9.1" diff --git a/src/funman/_version.py b/src/funman/_version.py index 3bca77a1..6adb2512 100644 --- a/src/funman/_version.py +++ b/src/funman/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "1.9.0" +__version__ = "1.9.1"