Skip to content

Commit d18dc58

Browse files
committed
shuffle
1 parent d305b52 commit d18dc58

5 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/wheels.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ jobs:
1515
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: actions/checkout@v4
18-
- name: Add requirements
19-
run: python -m pip install --upgrade pip wheel setuptools conan
20-
- name: Setup conan remote
21-
run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
2218
- name: Build SDist
2319
run: pipx run build --sdist
2420
- name: Check metadata
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
88
find_package(odrcore REQUIRED)
99
find_package(pybind11 REQUIRED)
1010

11-
pybind11_add_module(pyodr pyodr.cpp)
11+
pybind11_add_module(pyodr src/cpp/pyodr.cpp)
1212
target_link_libraries(pyodr PRIVATE odrcore::odrcore)
1313

1414
install(
File renamed without changes.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ requires = [
55
"ninja",
66
"cmake>=3.12",
77
"conan>=2.0.0",
8-
"scikit-build>=0.17.3",
8+
"scikit-build-core",
99
"skbuild-conan",
1010
]
1111
build-backend = "setuptools.build_meta"

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from skbuild_conan import setup
22
from setuptools import find_packages
3+
import subprocess
4+
5+
6+
subprocess.run(["conan", "remote", "add", "--index", "0", "odr", "https://artifactory.opendocument.app/artifactory/api/conan/conan"])
37

48

59
setup(
@@ -18,6 +22,5 @@
1822
"dev": ["black"],
1923
"test": ["pytest>=6.0"],
2024
},
21-
conanfile="src/cpp/conanfile.txt",
2225
conan_profile_settings={"compiler.cppstd": "20"},
2326
)

0 commit comments

Comments
 (0)