CVS commit: pkgsrc/devel/py-ninja

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-ninja
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 24 Nov 2024 07:21:16 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Nov 24 07:21:16 UTC 2024

Modified Files:
        pkgsrc/devel/py-ninja: Makefile PLIST distinfo
        pkgsrc/devel/py-ninja/patches: patch-CMakeLists.txt

Log Message:
py-ninja: updated to 1.11.1.2

1.11.1.2

chore: remove versioneer related code from setup.py
fix: artifact upload/download
ci: group dependabot updates
chore(ci): bump test_sdist python from 3.11 to 3.12
feat: use scikit-build-core
feat: Python 3.7+
ci: bump to macos-13
fix(ci): test sdist on ubuntu-22.04
feat: add armv7l wheels
chore(deps): bump pypa/cibuildwheel to 2.22.0 in the actions group
chore: run pip check as part of tests


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-ninja/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-ninja/PLIST \
    pkgsrc/devel/py-ninja/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-ninja/Makefile
diff -u pkgsrc/devel/py-ninja/Makefile:1.2 pkgsrc/devel/py-ninja/Makefile:1.3
--- pkgsrc/devel/py-ninja/Makefile:1.2  Mon Nov 11 07:28:16 2024
+++ pkgsrc/devel/py-ninja/Makefile      Sun Nov 24 07:21:16 2024
@@ -1,28 +1,24 @@
-# $NetBSD: Makefile,v 1.2 2024/11/11 07:28:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/11/24 07:21:16 adam Exp $
 
-DISTNAME=      ninja-1.11.1.1
+DISTNAME=      ninja-1.11.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    devel
+CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/ninja/}
 DISTFILES=     ${DEFAULT_DISTFILES} ninja-1.11.1.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://pypi.org/project/ninja/
+HOMEPAGE=      https://github.com/scikit-build/ninja-python-distributions
 COMMENT=       Python bindings for the ninja build tool
 LICENSE=       apache-2.0
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build-[0-9]*:../../devel/py-scikit-build
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= ${PYPKGPREFIX}-hatch-fancy-pypi-readme-[0-9]*:../../devel/py-hatch-fancy-pypi-readme
+TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build-core-[0-9]*:../../devel/py-scikit-build-core
 DEPENDS+=      ninja-build-[0-9]*:../../devel/ninja-build
-TEST_DEPENDS+= ${PYPKGPREFIX}-path-[0-9]*:../../devel/py-path
+TEST_DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=2.0:../../devel/py-importlib-metadata
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 
-USE_LANGUAGES+=        c c++
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+USE_LANGUAGES= c c++
 
 INSTALLATION_DIRS+=    ${PYSITELIB}/ninja/data/bin
 
@@ -32,7 +28,6 @@ post-extract:
 
 # add symlink where the normal build system would put the freshly-compiled ninja binary
 post-install:
-       ${RM} ${DESTDIR}${PREFIX}/bin/ninja
        cd ${DESTDIR}${PREFIX}/${PYSITELIB}/ninja/data/bin && ${LN} -s ${PREFIX}/bin/ninja .
 
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/devel/py-ninja/PLIST
diff -u pkgsrc/devel/py-ninja/PLIST:1.1 pkgsrc/devel/py-ninja/PLIST:1.2
--- pkgsrc/devel/py-ninja/PLIST:1.1     Sun May 12 17:45:15 2024
+++ pkgsrc/devel/py-ninja/PLIST Sun Nov 24 07:21:16 2024
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2024/05/12 17:45:15 wiz Exp $
-${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS.rst
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE_Apache_20
+@comment $NetBSD: PLIST,v 1.2 2024/11/24 07:21:16 adam Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
-${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/AUTHORS.rst
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE_Apache_20
 ${PYSITELIB}/ninja/__init__.py
 ${PYSITELIB}/ninja/__init__.pyc
 ${PYSITELIB}/ninja/__init__.pyo
@@ -14,9 +12,11 @@ ${PYSITELIB}/ninja/__main__.pyc
 ${PYSITELIB}/ninja/__main__.pyo
 ${PYSITELIB}/ninja/_version.py
 ${PYSITELIB}/ninja/_version.pyc
+${PYSITELIB}/ninja/_version.pyi
 ${PYSITELIB}/ninja/_version.pyo
 ${PYSITELIB}/ninja/data/bin/ninja
 ${PYSITELIB}/ninja/ninja_syntax.py
 ${PYSITELIB}/ninja/ninja_syntax.pyc
+${PYSITELIB}/ninja/ninja_syntax.pyi
 ${PYSITELIB}/ninja/ninja_syntax.pyo
 ${PYSITELIB}/ninja/py.typed
Index: pkgsrc/devel/py-ninja/distinfo
diff -u pkgsrc/devel/py-ninja/distinfo:1.1 pkgsrc/devel/py-ninja/distinfo:1.2
--- pkgsrc/devel/py-ninja/distinfo:1.1  Sun May 12 17:45:15 2024
+++ pkgsrc/devel/py-ninja/distinfo      Sun Nov 24 07:21:16 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2024/05/12 17:45:15 wiz Exp $
+$NetBSD: distinfo,v 1.2 2024/11/24 07:21:16 adam Exp $
 
-BLAKE2s (ninja-1.11.1.1.tar.gz) = 8c661e3d19e072f989884502c51a5909e908d9a6c5b4a3b6b5312a9a519fed6f
-SHA512 (ninja-1.11.1.1.tar.gz) = 1dd3730c9c71da6279622603b7898c73e751d728a9e94f89d840e667c435cac4cff5c6dd850b7b921113d9adb9637999fc3872c7c18ffd3a4272ebc16947c408
-Size (ninja-1.11.1.1.tar.gz) = 132392 bytes
+BLAKE2s (ninja-1.11.1.2.tar.gz) = b196b8a7ea6a8aefa980ef8fc584af03bff464e33772f33548240413936dd02b
+SHA512 (ninja-1.11.1.2.tar.gz) = 5e9a7bbfa000187e256301075198c90c84b8b7f9926c2a1ef90e3922a58641fa9addd7569a7d804976bda41212fc7377f44fad0f8dce6256bee97e45d0a16550
+Size (ninja-1.11.1.2.tar.gz) = 129009 bytes
 BLAKE2s (ninja-1.11.1.tar.gz) = 31edc9a8845b6b1c0f54b8db714d2927b84cf2d0af15754838fcd7c646834a95
 SHA512 (ninja-1.11.1.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 Size (ninja-1.11.1.tar.gz) = 229479 bytes
-SHA1 (patch-CMakeLists.txt) = 16553011fc1029fd00ad81a1212f590800b84ad0
+SHA1 (patch-CMakeLists.txt) = 8c3d91b8afa76c5b0f98c2bc2f8f49fb9af908b9

Index: pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.1 pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt:1.1      Sun May 12 17:45:15 2024
+++ pkgsrc/devel/py-ninja/patches/patch-CMakeLists.txt  Sun Nov 24 07:21:16 2024
@@ -1,89 +1,33 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2024/05/12 17:45:15 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/11/24 07:21:16 adam Exp $
 
 Avoid downloading and building ninja.
 We'll just install a link to the pkgsrc copy in the package Makefile
 instead.
 
---- CMakeLists.txt.orig        2023-10-09 17:05:36.000000000 +0000
+--- CMakeLists.txt.orig        2022-11-09 12:37:21.000000000 +0000
 +++ CMakeLists.txt
-@@ -27,7 +27,7 @@ set(src_archive "unix_source")
+@@ -24,7 +24,6 @@ set(src_archive "unix_source")
  if(WIN32)
    set(src_archive "windows_source")
  endif()
 -check_archive_var("${src_archive}")
-+#check_archive_var("${src_archive}")
  
- #-----------------------------------------------------------------------------
- # Summary
-@@ -60,21 +60,6 @@ endif()
- #-----------------------------------------------------------------------------
- if(NOT DEFINED Ninja_SOURCE_DIR)
-   set(Ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src")
--
--  # Download selected source archive
--  ExternalProject_add(download_ninja_source
--    SOURCE_DIR ${Ninja_SOURCE_DIR}
--    URL ${${src_archive}_url}
--    URL_HASH SHA256=${${src_archive}_sha256}
--    DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR}
--    USES_TERMINAL_DOWNLOAD 1
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    BUILD_IN_SOURCE 1
--    INSTALL_COMMAND ""
--    ${ep_download_no_progress_args}
--    )
--  message(STATUS "download_ninja_source - URL: ${${src_archive}_url}")
- elseif(NOT EXISTS ${Ninja_SOURCE_DIR})
-   message(FATAL_ERROR "Ninja_SOURCE_DIR is set to a nonexistent directory")
+ message(STATUS "*********************************************")
+ message(STATUS "Ninja Python Distribution")
+@@ -46,15 +45,5 @@ if(NOT BUILD_VERBOSE)
+     )
  endif()
-@@ -102,48 +87,5 @@ foreach(var_name IN ITEMS
-   endif()
- endforeach()
  
--# _cache_args should not be empty
--list(APPEND _cache_args -DNINJA_SUPERBUILD:BOOL=true)
--ExternalProject_add(build_ninja
--  SOURCE_DIR ${Ninja_SOURCE_DIR}
--  BINARY_DIR ${Ninja_BINARY_DIR}
--  DOWNLOAD_COMMAND ""
--  UPDATE_COMMAND ""
--  BUILD_ALWAYS 1
--  USES_TERMINAL_CONFIGURE 1
--  USES_TERMINAL_BUILD 1
--  INSTALL_COMMAND ""
--  CMAKE_CACHE_ARGS ${_cache_args}
--  DEPENDS
--    download_ninja_source
--  )
--set(ninja_executable ${Ninja_BINARY_DIR}/ninja${CMAKE_EXECUTABLE_SUFFIX})
--set(NINJA_BUILD_LAST_STEP "build")
--
--# This should not be stripped or tested if cross-compiling on Windows
--if(CMAKE_CROSS_COMPILE OR NOT DEFINED ENV{DIST_EXTRA_CONFIG})
--  find_program(STRIP_EXECUTABLE strip)
--  if(STRIP_EXECUTABLE)
--    ExternalProject_Add_Step(build_ninja strip_executables
--      DEPENDEES ${NINJA_BUILD_LAST_STEP}
--      COMMENT "Stripping CMake executables"
--      COMMAND ${STRIP_EXECUTABLE} ${ninja_executable}
--      USES_TERMINAL 1
--      )
--    set(NINJA_BUILD_LAST_STEP "strip_executables")
--  endif()
--
--  if(RUN_NINJA_TEST)
--    ExternalProject_Add_Step(build_ninja run_ninja_test_suite
--      DEPENDEES ${NINJA_BUILD_LAST_STEP}
--      COMMENT "Running Ninja test suite"
--      COMMAND ${Ninja_BINARY_DIR}/ninja_test${CMAKE_EXECUTABLE_SUFFIX}
--      WORKING_DIRECTORY ${Ninja_BINARY_DIR}
--      USES_TERMINAL 1
--      )
--    set(NINJA_BUILD_LAST_STEP "run_ninja_test_suite")
--  endif()
--endif()
+-include(FetchContent)
+-FetchContent_Declare(
+-  ninja
+-  URL ${${src_archive}_url}
+-  URL_HASH SHA256=${${src_archive}_sha256}
+-  DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR}
+-  ${ep_download_no_progress_args}
+-)
+-FetchContent_MakeAvailable(ninja)
 -
- install(FILES ${Ninja_SOURCE_DIR}/misc/ninja_syntax.py DESTINATION src/ninja)
--install(PROGRAMS ${ninja_executable} DESTINATION src/ninja/data/bin)
-+#install(PROGRAMS ${ninja_executable} DESTINATION src/ninja/data/bin)
+-install(TARGETS ninja COMPONENT python DESTINATION "${SKBUILD_SCRIPTS_DIR}")
++set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src")
+ install(FILES "${ninja_SOURCE_DIR}/misc/ninja_syntax.py" COMPONENT python DESTINATION ninja)

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index