From e7b5010c25088427afa53fbcd8fe1096408f3e8c Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Tue, 20 Jul 2021 11:51:01 -0400
Subject: [PATCH 1/2] Update python3-pip

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2515ce0..3041364 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get -qq update \
   ninja-build=1.10.0-1build1 \
   openscad=2019.05-3ubuntu5 \
   pkg-config=0.29.1-0ubuntu4 \
-  python3-pip=20.0.2-5ubuntu1.1 \
+  python3-pip=20.0.2-5ubuntu1.5 \
   python3-venv=3.8.2-0ubuntu2 \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
 
-- 
GitLab


From 1975340414c2007cd4be24182a6f71ad304763d4 Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Tue, 20 Jul 2021 11:55:58 -0400
Subject: [PATCH 2/2] bump

---
 Dockerfile   | 4 ++--
 conanfile.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3041364..f215c14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get -qq update \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
 
   && pip3 install --no-cache-dir \
-  cmake==3.18.4.post1 \
-  conan==1.35.2
+  cmake==3.21.0 \
+  conan==1.38
 
 CMD [ "/bin/bash" ]
diff --git a/conanfile.py b/conanfile.py
index e110b07..c9c7f46 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -17,7 +17,7 @@ class CsgEbConan(ConanFile):
     default_options = {"shared": False}
     generators = "pkg_config"
     requires = ("catch2/2.13.6", "cgal/5.2.1", "taocpp-pegtl/3.2.0")
-    build_requires = ("meson/0.57.2",)
+    build_requires = ("meson/0.59.0",)
     exports_sources = "meson.build", "include/*", "src/*"
 
     def build(self):
-- 
GitLab