Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ jobs:
- uses: astral-sh/setup-uv@v6
with:
enable-cache: false
version: "0.7.10"

- name: Setup environment
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ninja-upstream"]
path = ninja-upstream
url = https://github.com/Kitware/ninja.git
url = https://github.com/ninja-build/ninja.git
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Ninja Python Distributions

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

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

.. image:: https://raw.githubusercontent.com/scikit-build/ninja-python-distributions/master/ninja-python-distributions-logo.png
Expand Down
22 changes: 11 additions & 11 deletions docs/update_ninja_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Updating the Ninja version
A developer should use the following steps to update the version ``X.Y.Z``
of Ninja associated with the current Ninja python distributions.

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

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

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

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

release=1.11.1.g95dee.kitware.jobserver-1
release=1.13.0
git checkout -b update-to-ninja-${release}
git add NinjaUrls.cmake README.rst docs/update_ninja_version.rst tests/test_ninja.py
git commit -m "Update to Ninja ${release}"
Expand Down
2 changes: 1 addition & 1 deletion ninja-upstream
Submodule ninja-upstream updated 124 files
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def bump(session: nox.Session) -> None:
"--upstream-repository",
metavar="UPSTREAM_REPOSITORY",
choices=["Kitware/ninja", "ninja-build/ninja"],
default="Kitware/ninja",
default="ninja-build/ninja",
help="Ninja upstream repository",
)
parser.add_argument(
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_ninja_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def main():
"--upstream-repository",
metavar="UPSTREAM_REPOSITORY",
choices=["Kitware/ninja", "ninja-build/ninja"],
default="Kitware/ninja",
default="ninja-build/ninja",
help="Ninja upstream repository",
)
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_ninja.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ def test_ninja_module():


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


def test_ninja_script():
expected_version = "1.11.1.git.kitware.jobserver-1"
expected_version = "1.13.0"
scripts = _get_scripts()
assert len(scripts) == 1
assert scripts[0].stem == "ninja"
Expand Down
Loading