Skip to content

Commit dc4fad9

Browse files
authored
Update to Ninja 1.13.2.g7659b.kitware.jobserver-pipe-1 (#363)
1 parent b1c0411 commit dc4fad9

5 files changed

Lines changed: 12 additions & 18 deletions

File tree

‎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.13.0.gd74ef.kitware.jobserver-pipe-1 <https://ninja-build.org/manual.html>`_ executable
7+
The latest Ninja python wheels provide `ninja 1.13.2.g7659b.kitware.jobserver-pipe-1 <https://ninja-build.org/manual.html>`_ executable
88
and `ninja_syntax.py` for generating `.ninja` files.
99

1010
The classes in ninja_syntax are in the ninja namespace, so are accesable via ``import ninja``, e.g. ::

‎docs/update_ninja_version.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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.13.0.gd74ef.kitware.jobserver-pipe-1
32+
$ release=1.13.2.g7659b.kitware.jobserver-pipe-1
3333
$ python scripts/update_ninja_version.py ${release}
3434

3535
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.13.0.gd74ef.kitware.jobserver-pipe-1.tar.gz
37-
Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.tar.gz - done
38-
Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.zip
39-
Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.zip - done
36+
Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.tar.gz
37+
Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.tar.gz - done
38+
Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.zip
39+
Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.zip - done
4040
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.13.0.gd74ef.kitware.jobserver-pipe-1
42-
Updating 'NinjaUrls.cmake' with CMake version 1.13.0.gd74ef.kitware.jobserver-pipe-1 - done
41+
Updating 'NinjaUrls.cmake' with CMake version 1.13.2.g7659b.kitware.jobserver-pipe-1
42+
Updating 'NinjaUrls.cmake' with CMake version 1.13.2.g7659b.kitware.jobserver-pipe-1 - 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.13.0.gd74ef.kitware.jobserver-pipe-1
54+
release=1.13.2.g7659b.kitware.jobserver-pipe-1
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}"

‎pyproject.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,6 @@ select = "*_s390x"
141141
inherit.config-settings = "append"
142142
config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-DepsLogTest.MalformedDepsLog"}
143143

144-
# Doesn't account for platform in 1.13.0 https://github.com/Kitware/ninja/pull/3
145-
[[tool.cibuildwheel.overrides]]
146-
select = "*-win*"
147-
inherit.config-settings = "append"
148-
config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-Jobserver.ParseNativeMakeFlagsValue"}
149-
150144

151145
[tool.pytest.ini_options]
152146
minversion = "6.0"

‎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.13.0.git.kitware.jobserver-pipe-1"
39+
expected_version = "1.13.2.git.kitware.jobserver-pipe-1"
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.13.0.git.kitware.jobserver-pipe-1"
45+
expected_version = "1.13.2.git.kitware.jobserver-pipe-1"
4646
scripts = _get_scripts()
4747
assert len(scripts) == 1
4848
assert scripts[0].stem == "ninja"

0 commit comments

Comments
 (0)