all: Remove constraints on Boost version from cppnetlib

Author: cassava

.github/workflows/build-cloe.yaml

@@ -46,13 +46,7 @@ jobs:
           make -f Makefile.setup PIP_INSTALL_ARGS="" install-python-deps
       - name: Configure Conan
         run: |
-          make setup-conan &&
-          # NOTE: Boost 1.69 has a bug (fixed in 74fb0a26099bc51d717f5f154b37231ce7df3e98) that
-          # prevents GCC >= 11 from interoperation, so disable the server for this case.
-          # (The server feature depends on cloe-oak, which *currently* depends on Boost <= 1.69.)
-          if [ $(gcc -dumpversion) -ge 11 ]; then
-            conan profile update options.cloe-engine:server=False default;
-          fi
+          make setup-conan
       - name: Build cloe w/ package
         run: |
           make ${{ matrix.package_target }}

Dockerfile

@@ -56,13 +56,7 @@ ENV CONAN_NON_INTERACTIVE=yes
 
 COPY dist/conan /cloe/dist/conan
 RUN make -f /cloe/Makefile.setup setup-conan && \
-    conan config set general.default_profile=${CONAN_PROFILE} && \
-    # NOTE: Boost 1.69 has a bug (fixed in 74fb0a26099bc51d717f5f154b37231ce7df3e98) that
-    # prevents GCC >= 11 from interoperation, so disable the server for this case.
-    # (The server feature depends on cloe-oak, which *currently* depends on Boost <= 1.69.)
-    if [ $(gcc -dumpversion) -ge 11 ]; then \
-        conan profile update options.cloe-engine:server=False ${CONAN_PROFILE}; \
-    fi
+    conan config set general.default_profile=${CONAN_PROFILE}
 
 # Build and Install Cloe
 #

conanfile.py

@@ -60,8 +60,6 @@ def cloe_requires(dep):
         boost_version = "[>=1.65.0]"
         if self.options.with_engine:
             cloe_requires("cloe-engine")
-            if self.options["cloe-engine"].server:
-                boost_version = "[>=1.65.0,<1.70]"
 
         # Overrides:
         self.requires("fmt/[~=8.1.1]", override=True)

engine/conanfile.py

@@ -54,9 +54,7 @@ def requirements(self):
         self.requires("cli11/[~=2.1.2]", private=True)
         if self.options.server:
             self.requires(f"cloe-oak/{self.version}@cloe/develop", private=True)
-            self.requires("boost/[>=1.65.1,<1.70.0]")
-        else:
-            self.requires("boost/[>=1.65.1]")
+        self.requires("boost/[>=1.65.1]")
         self.requires("fmt/[~=8.1.1]", override=True)
         self.requires("nlohmann_json/[~=3.10.5]", override=True)
 

engine/src/main_run.hpp

@@ -29,9 +29,8 @@
 #include <iostream>  // for cerr
 
 // NOTE: Unfortunately, <boost/uuid/uuid_generators.hpp> includes Boost headers
-// that make use of deprecated headers. This is fixed in Boost 1.70.0, which we
-// cannot use until we migrate oak::Server away from cppnetlib.
-// See: https://github.com/boostorg/random/issues/49
+// that make use of deprecated headers. This is fixed in Boost 1.70.0, but
+// we still need to support earlier versions of Boost.
 #define BOOST_ALLOW_DEPRECATED_HEADERS
 
 #include <boost/lexical_cast.hpp>          // for lexical_cast

engine/tests/conanfile_with_server.py

@@ -30,5 +30,3 @@ def requirements(self):
         self.requires(f"cloe-plugin-noisy-sensor/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
-
-        self.requires("boost/[<1.70]", override=True)

optional/vtd/tests/conanfile_with_vtd-2.2.0.py

@@ -48,5 +48,3 @@ def requirements(self):
 
         # Overrides:
         self.requires("zlib/1.2.13", override=True)
-        if self.options["cloe-engine"].server:
-            self.requires("boost/[<1.70]", override=True)

optional/vtd/tests/conanfile_with_vtd-2022.3.py

@@ -48,6 +48,3 @@ def requirements(self):
         self.requires("zlib/1.2.13", override=True)
         self.requires("incbin/cci.20211107", override=True)
         self.requires("vtd-api/2022.3@cloe/stable", override=True)
-
-        if self.options["cloe-engine"].server:
-            self.requires("boost/[<1.70]", override=True)

plugins/minimator/tests/conanfile_default.py

@@ -11,7 +11,7 @@ class CloeTest(ConanFile):
     python_requires_extend = "cloe-launch-profile.Base"
 
     default_options = {
-        "cloe-engine:server": False,
+        "cloe-engine:server": True,
     }
 
     @property
@@ -33,6 +33,3 @@ def requirements(self):
         self.requires(f"cloe-plugin-noisy-sensor/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
-
-        if self.options["cloe-engine"].server:
-            self.requires("boost/[<1.70]", override=True)

plugins/virtue/tests/conanfile_default.py

@@ -11,7 +11,7 @@ class CloeTest(ConanFile):
     python_requires_extend = "cloe-launch-profile.Base"
 
     default_options = {
-        "cloe-engine:server": False,
+        "cloe-engine:server": True,
     }
 
     @property
@@ -33,6 +33,3 @@ def requirements(self):
         self.requires(f"cloe-plugin-noisy-sensor/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
-
-        if self.options["cloe-engine"].server:
-            self.requires("boost/[<1.70]", override=True)

tests/conanfile_with_boost_1.78.py

@@ -12,7 +12,7 @@ class CloeTest(ConanFile):
 
     default_options = {
         "cloe:with_vtd": False,
-        "cloe-engine:server": False,
+        "cloe-engine:server": True,
     }
 
     @property