Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit b23c26c

Browse files
Update scikit-build
1 parent 09c91d5 commit b23c26c

File tree

8 files changed

+46
-145
lines changed

8 files changed

+46
-145
lines changed

.github/workflows/check-sdist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Build a source tarball
2626
run:
27-
python setup.py sdist
27+
python -m build --sdist
2828

2929
- name: Test tarball
3030
run: |

.github/workflows/publish-sdist-wheels.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
submodules: 'true'
3030

31-
- name: Install Python
32-
uses: actions/setup-python@v5
31+
- uses: actions/setup-python@v5
32+
name: Install Python 3.9
3333
with:
34-
python-version: '3.11'
34+
python-version: '3.9'
3535

3636
- name: Install cibuildwheel
3737
run: |
@@ -164,14 +164,18 @@ jobs:
164164
with:
165165
submodules: 'true'
166166

167-
- name: Set up Python
167+
- name: Set up Python 3.9
168168
uses: actions/setup-python@v5
169169
with:
170-
python-version: '3.10'
170+
python-version: 3.9
171+
172+
- name: Install Dependencies
173+
run:
174+
python -m pip install build
171175

172176
- name: Build a source tarball
173177
run:
174-
python setup.py sdist
178+
python -m build --sdist
175179

176180
- name: Test tarball
177181
run: |

3rdparty/HighFive

Submodule HighFive updated 134 files

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
cmake_minimum_required(VERSION 3.2)
1+
cmake_minimum_required(VERSION 3.15)
22
#allow using of HDF5_ROOT for building with a custom HDF5 version
33
cmake_policy(SET CMP0074 NEW)
4+
45
project(MorphIO VERSION 2.0.0)
56

67
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
@@ -42,6 +43,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
4243
if (EXTERNAL_HIGHFIVE)
4344
find_package(HighFive REQUIRED)
4445
endif()
46+
47+
set(PYBIND11_NEWPYTHON ON)
48+
4549
if (EXTERNAL_PYBIND11)
4650
find_package(pybind11 REQUIRED CONFIG)
4751
endif()

binds/python/pybind11

Submodule pybind11 updated 178 files

pyproject.toml

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[build-system]
22
requires = [
3-
"scikit-build-core",
4-
"setuptools_scm>=8",
5-
"cmake>=3.14",
6-
"ninja",
7-
"pybind11",
3+
"scikit-build-core>=0.10,<1",
4+
# use h5py's hdf5 install on Windows so we don't have to redistribute hdf5
5+
'h5py; platform_system == "Windows"'
86
]
97
build-backend = "scikit_build_core.build"
108

@@ -25,50 +23,46 @@ classifiers = [
2523
"Programming Language :: Python :: 3",
2624
"Programming Language :: Python :: 3.9",
2725
"Programming Language :: Python :: 3.10",
26+
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
2828
"Topic :: Scientific/Engineering :: Bio-Informatics",
2929
"License :: OSI Approved :: Apache Software License v2.0",
3030
]
31+
keywords = [
32+
"computational neuroscience",
33+
"morphology",
34+
"neuron",
35+
"neurolucida",
36+
"neuromorphology",
37+
]
3138
dynamic = ["version"]
32-
#dependencies = [
33-
# "blueetl-core>=0.1.0",
34-
#]
3539

36-
[tool.setuptools_scm]
37-
#
38-
# install_requires=install_requires,
39-
# extras_require={
40-
# 'docs': ['sphinx-bluebrain-theme'],
41-
# },
42-
# url='https://github.com/BlueBrain/MorphIO/',
43-
# ext_modules=[CMakeExtension('morphio._morphio'),
44-
# ],
45-
# cmdclass={'build_ext': CMakeBuild,
46-
# },
47-
# packages=[],
48-
# license="LGPLv3",
49-
# zip_safe=False,
50-
# use_scm_version=True,
51-
# setup_requires=[
52-
# 'setuptools_scm',
53-
# ],
54-
# python_requires=">=3.8",
55-
#)
40+
[project.optional-dependencies]
41+
docs = ["sphinx-bluebrain-theme"]
42+
43+
[project.urls]
44+
Homepage = "https://github.com/BlueBrain/MorphIO"
45+
Repository = "https://github.com/BlueBrain/MorphIO.git"
46+
Documentation = "https://morphio.readthedocs.io/"
47+
Tracker = "https://github.com/BlueBrain/MorphIO/issues"
5648

5749
[tool.scikit-build]
58-
cmake.targets = ["_morphio"]
50+
build.targets = ["_morphio"]
5951
metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
6052
wheel.packages = [ 'morphio', 'morphio.mut', 'morphio.vasculature' ]
6153
cmake.args = [
6254
"-DHIGHFIVE_EXAMPLES=OFF",
6355
"-DHIGHFIVE_UNIT_TESTS=OFF",
64-
'-DMORPHIO_TESTS=OFF',
56+
"-DMORPHIO_TESTS=OFF",
57+
"-DMorphIO_CXX_WARNINGS=OFF",
58+
"-GNinja",
6559
]
6660
#sdist.include = ["src/some_generated_file.txt"]
6761
#sdist.exclude = [".github"]
6862

63+
[tool.setuptools_scm]
64+
local_scheme = "no-local-version"
65+
6966
[tool.pytest.ini_options]
7067
testpaths = ["tests"]
7168

72-
#'-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
73-
#'-DMORPHIO_VERSION_STRING=' + self.distribution.get_version(),
74-
#'-DPYTHON_EXECUTABLE=' + sys.executable,

setup.py

Lines changed: 0 additions & 101 deletions
This file was deleted.

tests/test_0_API.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_doc_exists():
1919
morphio.mut.Soma,
2020
]
2121
for cls in classes:
22-
public_methods = (method for method in dir(cls) if not method[:2] == '__')
22+
public_methods = (method for method in dir(cls) if not method.startswith("_"))
2323
for method in public_methods:
2424
assert getattr(cls, method).__doc__, \
2525
'Public method {} of class {} is not documented !'.format(method, cls)

0 commit comments

Comments
 (0)