Replace confusing names

mamba-org · Nov 10, 2023 · c49d3eb · c49d3eb
1 parent a554b27
commit c49d3eb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/libmambapy/CMakeLists.txt b/libmambapy/CMakeLists.txt
@@ -24,23 +24,23 @@ find_package(Python COMPONENTS Interpreter Development)
 find_package(pybind11 REQUIRED)
 
 pybind11_add_module(
-    core
-    src/libmambapy/core/longpath.manifest
-    src/libmambapy/core/core.cpp
-    src/libmambapy/core/main.cpp
+    bindings
+    src/libmambapy/bindings/longpath.manifest
+    src/libmambapy/bindings/bindings.cpp
+    src/libmambapy/bindings/legacy.cpp
 )
 
-target_include_directories(core PRIVATE src/libmambapy/core)
+target_include_directories(bindings PRIVATE src/libmambapy/bindings)
 
-mamba_target_add_compile_warnings(core WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR})
+mamba_target_add_compile_warnings(bindings WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR})
 
-target_link_libraries(core PRIVATE pybind11::pybind11 ${libmamba_target})
-target_compile_features(core PRIVATE cxx_std_17)
+target_link_libraries(bindings PRIVATE pybind11::pybind11 ${libmamba_target})
+target_compile_features(bindings PRIVATE cxx_std_17)
 
 # Installation
 
 if(SKBUILD)
-    install(TARGETS core DESTINATION ${MAMBA_INSTALL_PYTHON_EXT_LIBDIR})
+    install(TARGETS bindings DESTINATION ${MAMBA_INSTALL_PYTHON_EXT_LIBDIR})
 else()
     # WARNING: this default should probably not be used as it is but set extranlly by a proper
     # Python packager tool
@@ -51,7 +51,7 @@ else()
     )
 
     install(
-        TARGETS core
+        TARGETS bindings
         EXCLUDE_FROM_ALL
         COMPONENT Mamba_Python_Extension
         DESTINATION ${MAMBA_INSTALL_PYTHON_EXT_LIBDIR}

diff --git a/libmambapy/setup.py b/libmambapy/setup.py
@@ -25,7 +25,7 @@ def libmambapy_version():
 
 skbuild.setup(
     version=libmambapy_version(),
-    packages=["libmambapy", "libmambapy.core"],
+    packages=["libmambapy", "libmambapy.bindings"],
     package_dir={"": "src"},
     package_data={"libmambapy": ["py.typed", "__init__.pyi"]},
     cmake_languages=["CXX"],

diff --git a/libmambapy/src/libmambapy/__init__.py b/libmambapy/src/libmambapy/__init__.py
@@ -1,5 +1,5 @@
 import libmambapy.version
-from libmambapy.core.bindings import *  # Legacy which used to combine everything
+from libmambapy.bindings.legacy import *  # Legacy which used to combine everything
 
 # Define top-level attributes
 __version__ = libmambapy.version.__version__
diff --git a/libmambapy/src/libmambapy/core/core.cpp → ...bapy/src/libmambapy/bindings/bindings.cpp b/libmambapy/src/libmambapy/core/core.cpp → ...bapy/src/libmambapy/bindings/bindings.cpp
@@ -4,9 +4,9 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "core.hpp"
+#include "bindings.hpp"
 
-PYBIND11_MODULE(core, m)
+PYBIND11_MODULE(bindings, m)
 {
-    mambapy::bindings::bind_submodule(m.def_submodule("bindings"));
+    mambapy::legacy::bind_submodule(m.def_submodule("legacy"));
 }
diff --git a/libmambapy/src/libmambapy/core/core.hpp → ...bapy/src/libmambapy/bindings/bindings.hpp b/libmambapy/src/libmambapy/core/core.hpp → ...bapy/src/libmambapy/bindings/bindings.hpp
@@ -11,7 +11,7 @@
 
 namespace mambapy
 {
-    namespace bindings
+    namespace legacy
     {
         void bind_submodule(pybind11::module_ m);
     }

diff --git a/...y/src/libmambapy/core/flat_set_caster.hpp → ...c/libmambapy/bindings/flat_set_caster.hpp b/...y/src/libmambapy/core/flat_set_caster.hpp → ...c/libmambapy/bindings/flat_set_caster.hpp
diff --git a/libmambapy/src/libmambapy/core/main.cpp → ...ambapy/src/libmambapy/bindings/legacy.cpp b/libmambapy/src/libmambapy/core/main.cpp → ...ambapy/src/libmambapy/bindings/legacy.cpp
@@ -38,7 +38,7 @@
 #include "mamba/specs/version.hpp"
 #include "mamba/util/string.hpp"
 
-#include "core.hpp"
+#include "bindings.hpp"
 #include "flat_set_caster.hpp"
 
 namespace py = pybind11;
@@ -1332,7 +1332,7 @@ bind_submodule_impl(pybind11::module_ m)
     m.attr("MAMBA_CLEAN_LOCKS") = MAMBA_CLEAN_LOCKS;
 }
 
-namespace mambapy::bindings
+namespace mambapy::legacy
 {
     void bind_submodule(pybind11::module_ m)
     {

diff --git a/...apy/src/libmambapy/core/longpath.manifest → ...src/libmambapy/bindings/longpath.manifest b/...apy/src/libmambapy/core/longpath.manifest → ...src/libmambapy/bindings/longpath.manifest