Skip to content

Commit 020195e

Browse files
henryiiihenryiii
authored
feat: use 1.13.0 official release (#302)
* feat: use 1.13.0 official release Signed-off-by: Henry Schreiner <[email protected]> * ci: pin uv for 3.7 support Signed-off-by: Henry Schreiner <[email protected]> * Update build.yml * Update .github/workflows/build.yml * tests: skip bad endianness test Signed-off-by: Henry Schreiner <[email protected]> --------- Signed-off-by: Henry Schreiner <[email protected]>
1 parent b15c91e commit 020195e

File tree

10 files changed

+28
-19
lines changed

10 files changed

+28
-19
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ jobs:
132132
- uses: astral-sh/setup-uv@v6
133133
with:
134134
enable-cache: false
135+
version: "0.6.17"
135136

136137
- name: Setup environment
137138
run: |

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "ninja-upstream"]
22
path = ninja-upstream
3-
url = https://github.com/Kitware/ninja.git
3+
url = https://github.com/ninja-build/ninja.git

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FetchContent_MakeAvailable(ninja)
2222

2323
if(RUN_NINJA_TEST)
2424
add_custom_target(
25-
run_ninja_test ALL "$<TARGET_FILE:ninja_test>"
25+
run_ninja_test ALL "$<TARGET_FILE:ninja_test>" ${TEST_OPTS}
2626
DEPENDS ninja_test
2727
WORKING_DIRECTORY "$<TARGET_FILE_DIR:ninja_test>"
2828
)

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Ninja Python Distributions
44

55
`Ninja <http://www.ninja-build.org>`_ is a small build system with a focus on speed.
66

7-
The latest Ninja python wheels provide `ninja 1.11.1.g95dee.kitware.jobserver-1 <https://ninja-build.org/manual.html>`_ executable
7+
The latest Ninja python wheels provide `ninja 1.13.0 <https://ninja-build.org/manual.html>`_ executable
88
and `ninja_syntax.py` for generating `.ninja` files.
99

1010
.. image:: https://raw.githubusercontent.com/scikit-build/ninja-python-distributions/master/ninja-python-distributions-logo.png

‎docs/update_ninja_version.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Updating the Ninja version
77
A developer should use the following steps to update the version ``X.Y.Z``
88
of Ninja associated with the current Ninja python distributions.
99

10-
Available Ninja archives can be found `here <https://github.com/Kitware/ninja/releases>`_.
10+
Available Ninja archives can be found `here <https://github.com/ninja-build/ninja/releases>`_.
1111

1212
Nox prodedure
1313
-------------
@@ -29,17 +29,17 @@ Classic procedure:
2929
2. Execute `scripts/update_ninja_version.py` command line tool with the desired
3030
``X.Y.Z`` Ninja version available for download. For example::
3131

32-
$ release=1.11.1.g95dee.kitware.jobserver-1
32+
$ release=1.13.0
3333
$ python scripts/update_ninja_version.py ${release}
3434

35-
Collecting URLs and SHA256s from 'https://github.com/Kitware/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1'
36-
Downloading https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.tar.gz
37-
Downloading https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.tar.gz - done
38-
Downloading https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.zip
39-
Downloading https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.zip - done
40-
Collecting URLs and SHA256s from 'https://github.com/Kitware/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1' - done
41-
Updating 'NinjaUrls.cmake' with CMake version 1.11.1.g95dee.kitware.jobserver-1
42-
Updating 'NinjaUrls.cmake' with CMake version 1.11.1.g95dee.kitware.jobserver-1 - done
35+
Collecting URLs and SHA256s from 'https://github.com/ninja-build/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1'
36+
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.tar.gz
37+
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.tar.gz - done
38+
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.zip
39+
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.zip - done
40+
Collecting URLs and SHA256s from 'https://github.com/ninja-build/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1' - done
41+
Updating 'NinjaUrls.cmake' with CMake version 1.13.0
42+
Updating 'NinjaUrls.cmake' with CMake version 1.13.0 - done
4343
Updating README.rst
4444
Updating README.rst - done
4545
Updating docs/update_ninja_version.rst
@@ -51,7 +51,7 @@ Classic procedure:
5151
3. Create a topic named `update-to-ninja-X.Y.Z` and commit the changes.
5252
For example::
5353

54-
release=1.11.1.g95dee.kitware.jobserver-1
54+
release=1.13.0
5555
git checkout -b update-to-ninja-${release}
5656
git add NinjaUrls.cmake README.rst docs/update_ninja_version.rst tests/test_ninja.py
5757
git commit -m "Update to Ninja ${release}"

‎ninja-upstream

Submodule ninja-upstream updated 124 files

‎noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def bump(session: nox.Session) -> None:
7676
"--upstream-repository",
7777
metavar="UPSTREAM_REPOSITORY",
7878
choices=["Kitware/ninja", "ninja-build/ninja"],
79-
default="Kitware/ninja",
79+
default="ninja-build/ninja",
8080
help="Ninja upstream repository",
8181
)
8282
parser.add_argument(

‎pyproject.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,16 @@ environment = { LDFLAGS = "-static-libstdc++ -static-libgcc" }
131131
select = "*-musllinux_s390x"
132132
build-frontend = "pip"
133133
inherit.test-command = "prepend"
134+
inherit.config-settings = "append"
134135
test-command = "pip check"
135136

137+
# Doesn't account for endianness in 1.13.0 https://github.com/ninja-build/ninja/issues/2614
138+
[[tool.cibuildwheel.overrides]]
139+
select = "*_s390x"
140+
inherit.config-settings = "append"
141+
config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-DepsLogTest.MalformedDepsLog"}
142+
143+
136144

137145
[tool.pytest.ini_options]
138146
minversion = "6.0"

‎scripts/update_ninja_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def main():
102102
"--upstream-repository",
103103
metavar="UPSTREAM_REPOSITORY",
104104
choices=["Kitware/ninja", "ninja-build/ninja"],
105-
default="Kitware/ninja",
105+
default="ninja-build/ninja",
106106
help="Ninja upstream repository",
107107
)
108108
parser.add_argument(

‎tests/test_ninja.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def test_ninja_module():
3636

3737

3838
def test_ninja_package():
39-
expected_version = "1.11.1.git.kitware.jobserver-1"
39+
expected_version = "1.13.0"
4040
output = subprocess.check_output([sys.executable, "-m", "ninja", "--version"]).decode("ascii")
4141
assert output.splitlines()[0] == expected_version
4242

4343

4444
def test_ninja_script():
45-
expected_version = "1.11.1.git.kitware.jobserver-1"
45+
expected_version = "1.13.0"
4646
scripts = _get_scripts()
4747
assert len(scripts) == 1
4848
assert scripts[0].stem == "ninja"

0 commit comments

Comments
 (0)