diff --git a/Dockerfile b/Dockerfile index 2515ce008dc21cba49ac9f2ac3fb366c2c166c97..f215c1480a7ee7c8df120652b7134f35916312b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ 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/* \ && 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 e110b076d3363cbdc9c21e3009f68cc09421e881..c9c7f46f105be08661c938ad92913ff7d8ce746f 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):