diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index 8f36964..f23fdfc 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -15,10 +15,6 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - name: Add requirements - run: python -m pip install --upgrade pip wheel setuptools conan - - name: Setup conan remote - run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan - name: Build SDist run: pipx run build --sdist - name: Check metadata diff --git a/src/cpp/CMakeLists.txt b/CMakeLists.txt similarity index 88% rename from src/cpp/CMakeLists.txt rename to CMakeLists.txt index c603612..d0e0b16 100644 --- a/src/cpp/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) find_package(odrcore REQUIRED) find_package(pybind11 REQUIRED) -pybind11_add_module(pyodr pyodr.cpp) +pybind11_add_module(pyodr src/cpp/pyodr.cpp) target_link_libraries(pyodr PRIVATE odrcore::odrcore) install( diff --git a/src/cpp/conanfile.txt b/conanfile.txt similarity index 100% rename from src/cpp/conanfile.txt rename to conanfile.txt diff --git a/pyproject.toml b/pyproject.toml index 37bff67..84c1a4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "ninja", "cmake>=3.12", "conan>=2.0.0", - "scikit-build>=0.17.3", + "scikit-build-core", "skbuild-conan", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 6a75e0a..b9b2f95 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,9 @@ from skbuild_conan import setup from setuptools import find_packages +import subprocess + + +subprocess.run(["conan", "remote", "add", "--index", "0", "odr", "https://artifactory.opendocument.app/artifactory/api/conan/conan"]) setup( @@ -18,6 +22,5 @@ "dev": ["black"], "test": ["pytest>=6.0"], }, - conanfile="src/cpp/conanfile.txt", conan_profile_settings={"compiler.cppstd": "20"}, )