make work

Author: andiwand

.github/workflows/pip.yaml

@@ -23,8 +23,6 @@ jobs:
       run: python -m pip install --upgrade pip wheel setuptools conan
     - name: Install conan config
       run: conan config install .github/config/${{ matrix.os }}/conan
-    - name: Setup conan remote
-      run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
     - name: Build and install
       run: pip install --verbose .[test]
     # TODO

.github/workflows/wheels.yaml

@@ -38,7 +38,6 @@ jobs:
         MACOSX_DEPLOYMENT_TARGET: 10.15
         CIBW_ARCHS_MACOS: auto universal2
         CIBW_SKIP: "*-win32 *-manylinux_i686"
-        CIBW_BEFORE_BUILD: "pip install conan && conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan"
         CIBW_BUILD_VERBOSITY: 1
     - name: Verify clean directory
       run: git diff --exit-code

CMakeLists.txt

@@ -8,10 +8,4 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 find_package(odrcore REQUIRED)
 find_package(pybind11 REQUIRED)
 
-pybind11_add_module(pyodr src/cpp/pyodr.cpp)
-target_link_libraries(pyodr PRIVATE odrcore::odrcore)
-
-install(
-    TARGETS pyodr
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
+add_subdirectory(src/pyodr)

pyproject.toml

@@ -9,45 +9,3 @@ requires = [
     "skbuild-conan",
 ]
 build-backend = "setuptools.build_meta"
-
-[tool.mypy]
-files = "setup.py"
-python_version = "3.7"
-strict = true
-show_error_codes = true
-enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
-warn_unreachable = true
-
-[[tool.mypy.overrides]]
-module = ["ninja"]
-ignore_missing_imports = true
-
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
-xfail_strict = true
-filterwarnings = [
-    "error",
-    "ignore:(ast.Str|Attribute s|ast.NameConstant|ast.Num) is deprecated:DeprecationWarning:_pytest",
-]
-testpaths = ["tests"]
-
-[tool.cibuildwheel]
-test-command = "pytest {project}/tests"
-test-extras = ["test"]
-test-skip = ["*universal2:arm64"]
-# Setuptools bug causes collision between pypy and cpython artifacts
-before-build = "rm -rf {project}/build"
-
-[tool.ruff]
-target-version = "py37"
-
-[tool.ruff.lint]
-extend-select = [
-  "B",    # flake8-bugbear
-  "I",    # isort
-  "PGH",  # pygrep-hooks
-  "RUF",  # Ruff-specific
-  "UP",   # pyupgrade
-]

setup.py

@@ -3,7 +3,20 @@
 import subprocess
 
 
-subprocess.run(["conan", "remote", "add", "--index", "0", "odr", "https://artifactory.opendocument.app/artifactory/api/conan/conan"])
+conan_odr_remote = "https://artifactory.opendocument.app/artifactory/api/conan/conan"
+result = subprocess.run(["conan", "remote", "list"], check=True, capture_output=True, text=True)
+if conan_odr_remote not in result.stdout:
+    print(f"Adding Conan remote {conan_odr_remote}")
+    subprocess.run(
+        [
+            "conan",
+            "remote",
+            "add",
+            "odr",
+            conan_odr_remote,
+        ],
+        check=True,
+    )
 
 
 setup(

src/pyodr/CMakeLists.txt

@@ -0,0 +1,7 @@
+pybind11_add_module(core core.cpp)
+target_link_libraries(core PRIVATE odrcore::odrcore)
+
+install(
+    TARGETS core
+    LIBRARY DESTINATION src/pyodr
+)

src/cpp/pyodr.cpp src/pyodr/core.cppsrc/cpp/pyodr.cpp renamed to src/pyodr/core.cpp

@@ -2,6 +2,6 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(pyodr, m) {
+PYBIND11_MODULE(core, m) {
     m.attr("__version__") = "dev";
 }