Replace conan 1 with conan 2 (#137) [skip ci]

* Replace conan 1 with conan 2

* Fix path issue on win builds

* oops

* Fix path on windows

* Ooop. It's Monday morning

Author: kuelumbus

conan_boost_mod/all/conandata.yml

@@ -1,7 +1,22 @@
 sources:
+  "1.88.0":
+    url:
+      - "https://archives.boost.io/release/1.88.0/source/boost_1_88_0.tar.bz2"
+      - "https://sourceforge.net/projects/boost/files/boost/1.88.0/boost_1_88_0.tar.bz2"
+    sha256: "46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5b12f7b"
+  "1.87.0":
+    url:
+      - "https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2"
+      - "https://sourceforge.net/projects/boost/files/boost/1.87.0/boost_1_87_0.tar.bz2"
+    sha256: "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89"
+  "1.86.0":
+    url:
+      - "https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
+      - "https://sourceforge.net/projects/boost/files/boost/1.86.0/boost_1_86_0.tar.bz2"
+    sha256: "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b"
   "1.85.0":
     url:
-      - "https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2"
+      - "https://archives.boost.io/release/1.85.0/source/boost_1_85_0.tar.bz2"
       - "https://sourceforge.net/projects/boost/files/boost/1.85.0/boost_1_85_0.tar.bz2"
     sha256: "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617"
   "1.84.0":

conan_boost_mod/all/conanfile.py

@@ -21,7 +21,7 @@
 import sys
 import yaml
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=2.0.0"
 
 # When adding (or removing) an option, also add this option to the list in
 # `rebuild-dependencies.yml` and re-run that script.

conanfile.py

@@ -0,0 +1,65 @@
+import os
+import sys
+from conan import ConanFile
+from conan.tools.cmake import CMakeDeps, CMakeToolchain
+from conan.tools.env import VirtualRunEnv
+from conan.tools.files import copy
+from pathlib import Path
+
+
+
+class RDKitConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    
+    def configure(self):
+        # Configure boost options
+        self.options["boost/*"].shared = True
+        self.options["boost/*"].without_python = False
+
+        # We always need a posix path with forward slashes
+        # Because the workflows run on Windows runners with the Git Bash shell,
+        # as_posix returns "/" paths
+        self.options["boost/*"].python_executable =  Path(sys.executable).as_posix()
+
+        # Platform-specific configurations
+        if self.settings.os == "Macos" and self.settings.arch == "armv8":
+            # stacktrace does not work on macOS arm64 for some reason
+            self.options["boost/*"].without_stacktrace = True
+        else:
+            self.options["boost/*"].without_stacktrace = False
+            
+        # Configure Python library linking for wheel building
+        if self.settings.os == "Windows":
+            self.options["boost/*"].without_python_lib = False
+        else:
+            self.options["boost/*"].without_python_lib = True
+
+    def requirements(self):
+        # Main boost requirement - use modified version
+        self.requires("boost/1.85.0@chris/mod_boost")
+        # self.requires("boost/1.85.0")
+        
+        # Platform-specific requirements
+        if self.settings.os == "Macos" and os.environ.get("CIBW_BUILD", "").startswith("cp"):
+            # macOS libraries to meet development target
+            self.requires("pixman/0.43.4")
+            self.requires("cairo/1.18.0") 
+            self.requires("libpng/1.6.43")
+            self.requires("fontconfig/2.15.0")
+            self.requires("freetype/2.13.2")
+
+    def build_requirements(self):
+        pass
+
+    def generate(self):
+        # Generate CMake dependencies
+        deps = CMakeDeps(self)
+        deps.generate()
+        
+        # Generate CMake toolchain
+        tc = CMakeToolchain(self)
+        tc.generate()
+        
+        # Generate virtual run environment
+        env = VirtualRunEnv(self)
+        env.generate()

pyproject.toml

@@ -4,7 +4,7 @@ requires = [
     "wheel",
     "cmake == 3.31.1",
     "numpy",
-    "conan == 1.66.0",
+    "conan >= 2.0.0",
     "ninja",
     "pybind11-stubgen",
     "Pillow",  # required for building the stubs

setup.py

@@ -37,6 +37,9 @@ def get_ext_filename(self, ext_name):
     def conan_install(self, boost_version, conan_toolchain_path):
         """Run the Conan"""
 
+        # Create default profile if it doesn't exist (Conan 2 requirement)
+        check_call(["conan", "profile", "detect", "--force"])
+
         # This modified conanfile.py for boost does not link libpython*.so
         # When building a platform wheel, we don't want to link libpython*.so.
         mod_conan_path = "conan_boost_mod"
@@ -47,72 +50,32 @@ def conan_install(self, boost_version, conan_toolchain_path):
                 "conan",
                 "export",
                 f"{mod_conan_path}/all/",
-                f"{boost_version}@chris/mod_boost",
+                f"--name=boost",
+                f"--version={boost_version}",
+                f"--user=chris",
+                f"--channel=mod_boost",
             ]
         )
 
-        without_python_lib = "boost:without_python_lib=False"
-        boost_version_string = f"boost/{boost_version}@chris/mod_boost"
-        without_stacktrace = "False"
-
-        if sys.platform != "win32":
-            # if no windows builds, compile boost without python lib.a/.so/.dylib
-            without_python_lib = "boost:without_python_lib=True"
-
-        if "macosx_arm64" in os.environ["CIBW_BUILD"]:
-            # does not work on macos arm64 for some reason
-            without_stacktrace = "True"
-
-        macos_libs = ""
-        if "macosx" in os.environ["CIBW_BUILD"]:
-            ## install these libraries to meet the development target
-            macos_libs = """
-pixman/0.43.4
-cairo/1.18.0
-libpng/1.6.43
-fontconfig/2.15.0
-freetype/2.13.2
-"""
-
-        conanfile = f"""\
-            [requires]
-            {boost_version_string}
-            {macos_libs}
-
-            [generators]
-            deploy
-            CMakeDeps
-            CMakeToolchain
-            VirtualRunEnv
-
-            [options]
-            boost:shared=True
-            boost:without_python=False
-            {without_python_lib}
-            boost:python_executable={sys.executable}
-            boost:without_stacktrace={without_stacktrace}
-        """
-        # boost:debug_level=1
-
-        Path("conanfile.txt").write_text(dedent(conanfile))
-
-        # run conan install
+        # run conan install using conanfile.py
         cmd = [
             "conan",
             "install",
-            "conanfile.txt",
+            ".",  # Use current directory with conanfile.py
             # build all missing
             "--build=missing",
-            "-if",
+            "--output-folder",
             f"{conan_toolchain_path}",
+            # copies files to output folder
+            "--deployer=direct_deploy",
         ]
 
         if sys.platform == "win32":
-            cmd += ["-pr:b", "default"]
+            cmd += ["--profile:build", "default"]
 
         # but force build b2 on linux
         if "linux" in sys.platform:
-            cmd += ["--build=b2", "-pr:b", "default"]
+            cmd += ["--build=b2/*", "--profile:build", "default"]
 
         check_call(cmd)
 
@@ -355,8 +318,8 @@ def to_win_path(pt: Path):
         # While repairing the wheels, the built libs need to be copied to the platform wheels
         # Also, the libs needs to be accessible for building the stubs
         rdkit_lib_path = rdkit_install_path / "lib"
-        boost_lib_path = conan_toolchain_path / "boost" / "lib"
-        boost_lib_path_bin_windows_only = conan_toolchain_path / "boost" / "bin"
+        boost_lib_path = conan_toolchain_path / "direct_deploy" / "boost" / "lib"
+        boost_lib_path_bin_windows_only = conan_toolchain_path / "direct_deploy" / "boost" / "bin"
 
         cmds = []
         if "linux" in sys.platform:
@@ -407,6 +370,7 @@ def to_win_path(pt: Path):
             [copy_file(i, str(to_path)) for i in boost_lib_path.rglob("*dylib")]
 
         # Build the RDKit stubs
+
         cmds += [
             f"cmake --build build --config Release --target stubs -v",
         ]