pkgconf 2.4.3.post1__tar.gz → 2.4.3.post2__tar.gz

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/.github/workflows/build.yml

@@ -33,15 +33,17 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - ubuntu-24.04-arm
           - windows-latest
-          - macos-13
-          - macos-14
+          - windows-11-arm
+          - macos-13      # x86-64
+          - macos-latest  # arm64
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: pypa/cibuildwheel@v2.18.1
+      - uses: pypa/cibuildwheel@2edf5784998b7b1ab70445baced23069e839541e # 3.0.0rc2
       - uses: actions/upload-artifact@v4
         if: always()
         with:
@@ -56,9 +58,9 @@ jobs:
       - uses: docker/setup-qemu-action@v3
         with:
           platforms: all
-      - uses: pypa/cibuildwheel@v2.18.1
+      - uses: pypa/cibuildwheel@2edf5784998b7b1ab70445baced23069e839541e # 3.0.0rc2
         env:
-          CIBW_ARCHS_LINUX: aarch64 ppc64le s390x
+          CIBW_ARCHS_LINUX: ppc64le s390x
       - uses: actions/upload-artifact@v4
         if: always()
         with:

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/.github/workflows/test.yml

@@ -15,19 +15,25 @@ concurrency:
 
 jobs:
   pytest:
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os:
-          - ubuntu
-          - windows
-          - macos
+          - ubuntu-latest
+          - windows-latest
+          - windows-11-arm
+          - macos-latest
         python:
           - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
           - '3.13'
+        exclude:
+          - os: windows-11-arm
+            python: '3.9'
+          - os: windows-11-arm
+            python: '3.10'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkgconf
-Version: 2.4.3.post1
+Version: 2.4.3.post2
 Summary: `pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.
 Author-Email: Ralf Gommers <ralf.gommers@gmail.com>, =?utf-8?q?Filipe_La=C3=ADns?= <lains@riseup.net>
 License: Copyright (c) 2024 pypackaging-native contributors

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/meson.build

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 project('pkgconf-pypi',
-  version : '2.4.3-1',
+  version : '2.4.3-2',
   license : 'MIT AND ISC',
   license_files : ['LICENSE'],
   meson_version : '>=1.3.2',
@@ -17,6 +17,7 @@ py.install_sources(
     'src/pkgconf/__init__.py',
     'src/pkgconf/__main__.py',
     'src/pkgconf/diagnose.py',
+    'src/pkgconf/py.typed',
   ],
   subdir: 'pkgconf',
 )

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/pyproject.toml

@@ -11,7 +11,7 @@ requires = ['meson-python', 'wheel']
 
 [project]
 name = 'pkgconf'
-version = '2.4.3-1'
+version = '2.4.3-2'
 description = '`pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.'
 readme = 'README.md'
 license = {file = 'LICENSE'}

{pkgconf-2.4.3.post1 → pkgconf-2.4.3.post2}/src/pkgconf/__init__.py

@@ -19,7 +19,7 @@ else:
     import importlib_metadata
 
 
-__version__ = '2.4.3-1'
+__version__ = '2.4.3-2'
 
 
 _LOGGER = logging.getLogger(__name__)

pkgconf-2.4.3.post2/update-upstream.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+import os
+import pathlib
+import shlex
+import subprocess
+import sys
+import warnings
+
+import tomllib
+
+
+def _use_colors() -> bool:
+    if 'NO_COLOR' in os.environ:
+        if 'FORCE_COLOR' in os.environ:
+            warnings.warn('Both NO_COLOR and FORCE_COLOR environment variables are set, disabling color', stacklevel=2)
+        return False
+    elif 'FORCE_COLOR' in os.environ or sys.stdout.isatty():
+        return os.name != 'nt'
+    return False
+
+
+if _use_colors():
+    dim = '\33[2m'
+    yellow = '\33[93m'
+    reset = '\33[0m'
+else:
+    dim = yellow = reset = ''
+
+
+root = pathlib.Path(__file__).parent
+submodule = root / 'subprojects' / 'pkgconf'
+
+version_files = [
+    root / 'pyproject.toml',
+    root / 'meson.build',
+    root / 'src' / 'pkgconf' / '__init__.py',
+]
+
+
+def git(*args: str, cwd: str | os.PathLike = submodule, capture: bool = False) -> subprocess.CompletedProcess:
+    args = ['git', *args]
+    print(dim + '$ ' + shlex.join(args) + reset)
+    try:
+        process = subprocess.run(args, cwd=cwd, capture_output=capture, text=True, check=True)
+    except subprocess.CalledProcessError as e:
+        sys.exit(e.returncode)
+    if capture:
+        if process.stdout:
+            sys.stderr.write(process.stdout)
+        if process.stderr:
+            sys.stderr.write(process.stderr)
+    return process
+
+
+with root.joinpath('pyproject.toml').open('rb') as f:
+    pyproject_data = tomllib.load(f)
+
+downstream_version = pyproject_data['project']['version']
+downstream_version_tuple = tuple(downstream_version.split('-')[0].split('.'))
+print(f'{yellow}Current version: {downstream_version}{reset}')
+
+# Get the latest upstream version
+# subprocess.check_output(['git', 'fetch', 'origin', 'master'], cwd=submodule)
+git('fetch', 'origin', 'master')
+# upstream_latest_tag = subprocess.check_output(['git', 'describe', -'-tags', '--abbrev=0'], cwd=submodule)
+upstream_latest_tag = git('describe', '--tags', '--abbrev=0', capture=True).stdout.strip()
+upstream_version = upstream_latest_tag.removeprefix('pkgconf-')
+upstream_version_tuple = tuple(upstream_version.split('.'))
+
+
+if upstream_version_tuple > downstream_version_tuple:
+    print(f'{yellow}Found new upstream version: {upstream_version} (current: {downstream_version}){reset}')
+    print(f'{yellow}Updating...{reset}')
+    # subprocess.check_output(['git', 'checkout', upstream_latest_tag], cwd=submodule)
+    git('checkout', upstream_latest_tag)
+    new_downstream_version = f'{upstream_version}-0'
+    print(f'{yellow}New version: {new_downstream_version}{reset}')
+    for file in version_files:
+        file.write_text(
+            file.read_text().replace(
+                f"'{downstream_version}'",
+                f"'{new_downstream_version}'",
+            )
+        )