diff --git a/README.rst b/README.rst index c43c9f2..727a55b 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ Ninja Python Distributions `Ninja `_ is a small build system with a focus on speed. -The latest Ninja python wheels provide `ninja 1.13.0.gd74ef.kitware.jobserver-pipe-1 `_ executable +The latest Ninja python wheels provide `ninja 1.13.2.g7659b.kitware.jobserver-pipe-1 `_ executable and `ninja_syntax.py` for generating `.ninja` files. The classes in ninja_syntax are in the ninja namespace, so are accesable via ``import ninja``, e.g. :: diff --git a/docs/update_ninja_version.rst b/docs/update_ninja_version.rst index 288b159..fa8f3e3 100644 --- a/docs/update_ninja_version.rst +++ b/docs/update_ninja_version.rst @@ -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.13.0.gd74ef.kitware.jobserver-pipe-1 + $ release=1.13.2.g7659b.kitware.jobserver-pipe-1 $ 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.13.0.gd74ef.kitware.jobserver-pipe-1.tar.gz - Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.tar.gz - done - Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.zip - Downloading https://github.com/Kitware/ninja/archive/v1.13.0.gd74ef.kitware.jobserver-pipe-1.zip - done + Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.tar.gz + Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.tar.gz - done + Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-1.zip + Downloading https://github.com/Kitware/ninja/archive/v1.13.2.g7659b.kitware.jobserver-pipe-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.13.0.gd74ef.kitware.jobserver-pipe-1 - Updating 'NinjaUrls.cmake' with CMake version 1.13.0.gd74ef.kitware.jobserver-pipe-1 - done + Updating 'NinjaUrls.cmake' with CMake version 1.13.2.g7659b.kitware.jobserver-pipe-1 + Updating 'NinjaUrls.cmake' with CMake version 1.13.2.g7659b.kitware.jobserver-pipe-1 - done Updating README.rst Updating README.rst - done Updating docs/update_ninja_version.rst @@ -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.13.0.gd74ef.kitware.jobserver-pipe-1 + release=1.13.2.g7659b.kitware.jobserver-pipe-1 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}" diff --git a/ninja-upstream b/ninja-upstream index d74efef..7659b3d 160000 --- a/ninja-upstream +++ b/ninja-upstream @@ -1 +1 @@ -Subproject commit d74efef9fa331d3ae60b62479d49254827c081fe +Subproject commit 7659b3d8f4f6204f6f9a1b3a5c9832334fa2834f diff --git a/pyproject.toml b/pyproject.toml index 4b653cf..03ab44b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -141,12 +141,6 @@ select = "*_s390x" inherit.config-settings = "append" config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-DepsLogTest.MalformedDepsLog"} -# Doesn't account for platform in 1.13.0 https://github.com/Kitware/ninja/pull/3 -[[tool.cibuildwheel.overrides]] -select = "*-win*" -inherit.config-settings = "append" -config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-Jobserver.ParseNativeMakeFlagsValue"} - [tool.pytest.ini_options] minversion = "6.0" diff --git a/tests/test_ninja.py b/tests/test_ninja.py index bac8be4..3277b7e 100644 --- a/tests/test_ninja.py +++ b/tests/test_ninja.py @@ -36,13 +36,13 @@ def test_ninja_module(): def test_ninja_package(): - expected_version = "1.13.0.git.kitware.jobserver-pipe-1" + expected_version = "1.13.2.git.kitware.jobserver-pipe-1" output = subprocess.check_output([sys.executable, "-m", "ninja", "--version"]).decode("ascii") assert output.splitlines()[0] == expected_version def test_ninja_script(): - expected_version = "1.13.0.git.kitware.jobserver-pipe-1" + expected_version = "1.13.2.git.kitware.jobserver-pipe-1" scripts = _get_scripts() assert len(scripts) == 1 assert scripts[0].stem == "ninja"