Remove deprecated settings and bump Conan (Project-OSRM#7149)

Author: DennisOSRM

.github/workflows/osrm-backend.yml

@@ -52,7 +52,7 @@ jobs:
 
         python3 -m venv .venv
         source .venv/Scripts/Activate
-        python3 -m pip install conan==2.7.1
+        python3 -m pip install conan==2.15.0
         conan profile detect --force
 
         cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON ..
@@ -493,7 +493,7 @@ jobs:
         if [[ "${ENABLE_CONAN}" == "ON" ]]; then
           python3 -m venv .venv
           source .venv/bin/activate
-          python3 -m pip install conan==2.7.1
+          python3 -m pip install conan==2.15.0
           conan profile detect --force
         fi
 

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Unreleased
+  - Changes from 6.0.0 RC1
+    - Features
+      - REMOVED: Remove deprecated contractor config settings [#7149](https://github.com/Project-OSRM/osrm-backend/pull/7149)
+    - Build:
+      - CHANGED: Updated Conan to v2.15.0 [#7148](https://github.com/Project-OSRM/osrm-backend/pull/7148)
 
 # 6.0.0 RC1
   - Changes from 5.27.1

include/contractor/contractor_config.hpp

@@ -55,17 +55,7 @@ struct ContractorConfig final : storage::IOConfig
 
     updater::UpdaterConfig updater_config;
 
-    // DEPRECATED to be removed in v6.0
-    bool use_cached_priority = false;
-
     unsigned requested_num_threads = 0;
-
-    // DEPRECATED to be removed in v6.0
-    // A percentage of vertices that will be contracted for the hierarchy.
-    // Offers a trade-off between preprocessing and query time.
-    // The remaining vertices form the core of the hierarchy
-    //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%)
-    double core_factor = 1.0;
 };
 } // namespace osrm::contractor
 

src/contractor/contractor.cpp

@@ -40,18 +40,6 @@ int Contractor::Run()
     tbb::global_control gc(tbb::global_control::max_allowed_parallelism,
                            config.requested_num_threads);
 
-    if (config.core_factor != 1.0)
-    {
-        util::Log(logWARNING)
-            << "Using core factor is deprecated and will be ignored. Falling back to CH.";
-        config.core_factor = 1.0;
-    }
-
-    if (config.use_cached_priority)
-    {
-        util::Log(logWARNING) << "Using cached priorities is deprecated and they will be ignored.";
-    }
-
     TIMER_START(preparing);
 
     util::Log() << "Reading node weights.";