Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-onigurumacffi for 
openSUSE:Factory checked in at 2023-10-17 20:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-onigurumacffi (Old)
 and      /work/SRC/openSUSE:Factory/.python-onigurumacffi.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-onigurumacffi"

Tue Oct 17 20:24:17 2023 rev:2 rq:1118021 version:1.3.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/python-onigurumacffi/python-onigurumacffi.changes    
    2023-05-05 15:59:39.844902911 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-onigurumacffi.new.20540/python-onigurumacffi.changes
     2023-10-17 20:24:22.533973924 +0200
@@ -1,0 +2,6 @@
+Sat Oct 14 18:54:33 UTC 2023 - Johannes Kastl <ka...@b1-systems.de>
+
+- update to 1.3.0:
+  no changelog provided upstream
+
+-------------------------------------------------------------------

Old:
----
  onigurumacffi-1.2.0.tar.gz

New:
----
  onigurumacffi-1.3.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-onigurumacffi.spec ++++++
--- /var/tmp/diff_new_pack.CGfhQg/_old  2023-10-17 20:24:23.322001510 +0200
+++ /var/tmp/diff_new_pack.CGfhQg/_new  2023-10-17 20:24:23.322001510 +0200
@@ -18,18 +18,18 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-onigurumacffi
-Version:        1.2.0
+Version:        1.3.0
 Release:        0
 Summary:        Python cffi bindings for the oniguruma regex engine
 License:        MIT
 URL:            https://github.com/asottile/onigurumacffi
 Source:         
https://github.com/asottile/onigurumacffi/archive/refs/tags/v%{version}.tar.gz#/onigurumacffi-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module cffi >= 1}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
-BuildRequires:  %{python_module cffi >= 1}
+BuildRequires:  python-rpm-macros
 # SECTION test requirements
 BuildRequires:  %{python_module pytest}
 # /SECTION

++++++ onigurumacffi-1.2.0.tar.gz -> onigurumacffi-1.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/onigurumacffi-1.2.0/.github/actions/pre-test/action.yml 
new/onigurumacffi-1.3.0/.github/actions/pre-test/action.yml
--- old/onigurumacffi-1.2.0/.github/actions/pre-test/action.yml 1970-01-01 
01:00:00.000000000 +0100
+++ new/onigurumacffi-1.3.0/.github/actions/pre-test/action.yml 2023-10-14 
19:00:39.000000000 +0200
@@ -0,0 +1,56 @@
+inputs:
+  arch:
+    default: ${{ matrix.arch }}
+runs:
+  using: composite
+  steps:
+  - name: setup vars
+    shell: bash
+    run: echo "ONIGURUMA_CLONE=${WS}${SLASH}oniguruma" >> "$GITHUB_ENV"
+    env:
+      WS: ${{ github.workspace }}
+      SLASH: ${{ runner.os == 'Windows' && '\' || '/' }}
+  - uses: actions/cache@v3
+    id: oniguruma-cache
+    with:
+      key: ${{ runner.os }} | ${{ inputs.arch }} | ${{ 
hashFiles('bin/clone-oniguruma') }}
+      path: ${{ env.ONIGURUMA_CLONE }}
+  - name: build oniguruma (windows)
+    shell: cmd
+    run: |
+      bash bin\clone-oniguruma
+      call "C:\Program Files\Microsoft Visual 
Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ inputs.arch }}
+      cd %ONIGURUMA_CLONE%
+      make_win.bat
+    if: runner.os == 'Windows' && steps.oniguruma-cache.outputs.cache-hit != 
'true'
+  - name: build oniguruma (macos)
+    shell: bash
+    run: |
+      set -x
+      brew install autoconf automake libtool
+      bin/clone-oniguruma
+      cd "$ONIGURUMA_CLONE"
+      ./autogen.sh
+      ./configure
+      make -j4
+    if: runner.os == 'macOS' && steps.oniguruma-cache.outputs.cache-hit != 
'true'
+  - name: build oniguruma (linux)
+    shell: bash
+    run: |
+      set -x
+      bin/clone-oniguruma
+      cd "$ONIGURUMA_CLONE"
+      ./autogen.sh
+      ./configure
+      make -j4
+    if: runner.os == 'Linux' && steps.oniguruma-cache.outputs.cache-hit != 
'true'
+  - name: install oniguruma (macos)
+    shell: bash
+    run: sudo make -C "$ONIGURUMA_CLONE" install
+    if: runner.os == 'macOS'
+  - name: install oniguruma (linux)
+    shell: bash
+    run: |
+      sudo make -C "$ONIGURUMA_CLONE" install
+      sudo ldconfig
+    if: runner.os == 'Linux'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/.github/workflows/main.yml 
new/onigurumacffi-1.3.0/.github/workflows/main.yml
--- old/onigurumacffi-1.2.0/.github/workflows/main.yml  1970-01-01 
01:00:00.000000000 +0100
+++ new/onigurumacffi-1.3.0/.github/workflows/main.yml  2023-10-14 
19:00:39.000000000 +0200
@@ -0,0 +1,27 @@
+name: main
+
+on:
+  push:
+    branches: [main, test-me-*]
+    tags: '*'
+  pull_request:
+
+jobs:
+  main-windows:
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.5.0
+    with:
+      env: '["py38"]'
+      os: windows-latest
+      arch: '["x64", "x86"]'
+      wheel-tags: true
+  main-macos:
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.5.0
+    with:
+      env: '["py38"]'
+      os: macos-latest
+      wheel-tags: true
+  main-linux:
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.5.0
+    with:
+      env: '["py38", "py39", "py310"]'
+      os: ubuntu-latest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/.pre-commit-config.yaml 
new/onigurumacffi-1.3.0/.pre-commit-config.yaml
--- old/onigurumacffi-1.2.0/.pre-commit-config.yaml     2022-05-01 
00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/.pre-commit-config.yaml     2023-10-14 
19:00:39.000000000 +0200
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -10,33 +10,32 @@
     -   id: name-tests-test
     -   id: requirements-txt-fixer
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.1
+    rev: v2.5.0
     hooks:
     -   id: setup-cfg-fmt
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.0.1
+-   repo: https://github.com/asottile/reorder-python-imports
+    rev: v3.12.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py37-plus, --add-import, 'from __future__ import annotations']
+        args: [--py38-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.2.3
+    rev: v3.1.0
     hooks:
     -   id: add-trailing-comma
-        args: [--py36-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v3.15.0
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus]
--   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.6.0
+        args: [--py38-plus]
+-   repo: https://github.com/hhatto/autopep8
+    rev: v2.0.4
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.1.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
+    rev: v1.5.1
     hooks:
     -   id: mypy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/README.md 
new/onigurumacffi-1.3.0/README.md
--- old/onigurumacffi-1.2.0/README.md   2022-05-01 00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/README.md   2023-10-14 19:00:39.000000000 +0200
@@ -1,5 +1,4 @@
-[![Build 
Status](https://dev.azure.com/asottile/asottile/_apis/build/status/asottile.onigurumacffi?branchName=main)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=61&branchName=main)
-[![Azure DevOps 
coverage](https://img.shields.io/azure-devops/coverage/asottile/asottile/61/main.svg)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=61&branchName=main)
+[![build 
status](https://github.com/asottile/onigurumacffi/actions/workflows/main.yml/badge.svg)](https://github.com/asottile/onigurumacffi/actions/workflows/main.yml)
 [![pre-commit.ci 
status](https://results.pre-commit.ci/badge/github/asottile/onigurumacffi/main.svg)](https://results.pre-commit.ci/latest/github/asottile/onigurumacffi/main)
 
 onigurumacffi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/azure-pipelines.yml 
new/onigurumacffi-1.3.0/azure-pipelines.yml
--- old/onigurumacffi-1.2.0/azure-pipelines.yml 2022-05-01 00:36:22.000000000 
+0200
+++ new/onigurumacffi-1.3.0/azure-pipelines.yml 1970-01-01 01:00:00.000000000 
+0100
@@ -1,81 +0,0 @@
-trigger:
-  branches:
-    include: [main, test-me-*]
-  tags:
-    include: ['*']
-
-resources:
-  repositories:
-    - repository: asottile
-      type: github
-      endpoint: github
-      name: asottile/azure-pipeline-templates
-      ref: refs/tags/v2.4.0
-
-jobs:
-- template: job--python-tox.yml@asottile
-  parameters:
-    toxenvs: [py37]
-    os: windows
-    architectures: [x64, x86]
-    wheel_tags: true
-    additional_variables:
-      ONIGURUMA_CLONE: $(Pipeline.Workspace)\oniguruma
-    pre_test:
-    - task: Cache@2
-      inputs:
-        key: windows-oniguruma | bin/clone-oniguruma | "$(arch)"
-        path: $(ONIGURUMA_CLONE)
-        cacheHitVar: ONIGURUMA_CACHE
-    - bash: ./bin/clone-oniguruma
-      condition: ne(variables.ONIGURUMA_CACHE, 'true')
-      displayName: clone oniguruma
-    - script: |
-        call "C:\Program Files\Microsoft Visual 
Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" $(arch)
-        cd %ONIGURUMA_CLONE%
-        make_win.bat
-      condition: ne(variables.ONIGURUMA_CACHE, 'true')
-      displayName: build oniguruma
-- template: job--python-tox.yml@asottile
-  parameters:
-    toxenvs: [py37]
-    os: macos
-    wheel_tags: true
-    additional_variables:
-      ONIGURUMA_CLONE: $(Pipeline.Workspace)/oniguruma
-    pre_test:
-    - bash: brew install autoconf automake libtool
-      displayName: install autotools
-    - task: Cache@2
-      inputs:
-        key: macos-oniguruma | bin/clone-oniguruma
-        path: $(ONIGURUMA_CLONE)
-        cacheHitVar: ONIGURUMA_CACHE
-    - bash: |
-        ./bin/clone-oniguruma
-        cd "$ONIGURUMA_CLONE"
-        ./autogen.sh && ./configure && make -j4
-      condition: ne(variables.ONIGURUMA_CACHE, 'true')
-      displayName: clone and build oniguruma
-    - bash: sudo make -C "$ONIGURUMA_CLONE" install
-      displayName: install oniguruma
-- template: job--python-tox.yml@asottile
-  parameters:
-    toxenvs: [py37, py38, py39]
-    os: linux
-    additional_variables:
-      ONIGURUMA_CLONE: $(Pipeline.Workspace)/oniguruma
-    pre_test:
-    - task: Cache@2
-      inputs:
-        key: linux-oniguruma | bin/clone-oniguruma
-        path: $(ONIGURUMA_CLONE)
-        cacheHitVar: ONIGURUMA_CACHE
-    - bash: |
-        ./bin/clone-oniguruma
-        cd "$ONIGURUMA_CLONE"
-        ./autogen.sh && ./configure && make -j4
-      condition: ne(variables.ONIGURUMA_CACHE, 'true')
-      displayName: clone and build oniguruma
-    - bash: sudo make -C "$ONIGURUMA_CLONE" install && sudo ldconfig
-      displayName: install oniguruma
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/bin/build-manylinux-wheels 
new/onigurumacffi-1.3.0/bin/build-manylinux-wheels
--- old/onigurumacffi-1.2.0/bin/build-manylinux-wheels  2022-05-01 
00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/bin/build-manylinux-wheels  2023-10-14 
19:00:39.000000000 +0200
@@ -14,24 +14,20 @@
     && ./autogen.sh && ./configure && make -j4 install \
     && rm -rf "$ONIGURUMA_CLONE"
 '''
+PROG = '''\
+{py_bin}/pip wheel --wheel-dir /work --no-deps onigurumacffi=={version} &&
+auditwheel repair --wheel-dir /dist /work/*.whl &&
+find /dist/ -name '*.whl' -print0 | xargs -n1 -0 --verbose unzip -l
+'''
 
 
 def main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('version')
-    parser.add_argument('--pypy', action='store_true')
     args = parser.parse_args()
 
-    if args.pypy:
-        img = 'onigurumacffi-build-pypy'
-        base = 'pypywheels/manylinux2010-pypy_x86_64:latest'
-        py_bin = '/opt/python/pp37-pypy37_pp73/bin'
-    else:
-        img = 'onigurumacffi-build-cpython'
-        base = 'quay.io/pypa/manylinux1_x86_64:latest'
-        py_bin = '/opt/python/cp37-cp37m/bin'
-
-    pkg = f'onigurumacffi=={args.version}'
+    img = 'onigurumacffi-build'
+    base = 'quay.io/pypa/manylinux2010_x86_64'
 
     with open(os.path.join(os.path.dirname(__file__), 'clone-oniguruma')) as f:
         clone = ' && '.join(f.read().splitlines()[3:])
@@ -43,17 +39,20 @@
     shutil.rmtree('dist', ignore_errors=True)
     os.makedirs('dist', exist_ok=True)
 
-    PROG = f'''\
-{py_bin}/pip wheel --wheel-dir /work --no-deps {pkg} &&
-auditwheel repair --wheel-dir /dist /work/*.whl &&
-find /dist/ -name '*.whl' -print0 | xargs -n1 -0 --verbose unzip -l
-'''
-
-    return subprocess.call((
-        'docker', 'run',
-        '--volume', f'{os.path.abspath("dist")}:/dist:rw',
-        '--rm', '-ti', img, 'bash', '-euxc', PROG,
-    ))
+    for py_bin in (
+        '/opt/python/cp37-cp37m/bin',
+        '/opt/python/pp37-pypy37_pp73/bin',
+        '/opt/python/pp38-pypy38_pp73/bin',
+    ):
+        prog = PROG.format(py_bin=py_bin, version=args.version)
+        if subprocess.call((
+                'docker', 'run',
+                '--volume', f'{os.path.abspath("dist")}:/dist:rw',
+                '--rm', '-ti', img, 'bash', '-euxc', prog,
+        )):
+            return 1
+    else:
+        return 0
 
 
 if __name__ == '__main__':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/bin/clone-oniguruma 
new/onigurumacffi-1.3.0/bin/clone-oniguruma
--- old/onigurumacffi-1.2.0/bin/clone-oniguruma 2022-05-01 00:36:22.000000000 
+0200
+++ new/onigurumacffi-1.3.0/bin/clone-oniguruma 2023-10-14 19:00:39.000000000 
+0200
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -euxo pipefail
-ONIGURUMA_VERSION=v6.9.8
+ONIGURUMA_VERSION=v6.9.9
 git init "${ONIGURUMA_CLONE}"
 cd "${ONIGURUMA_CLONE}"
 git remote add origin https://github.com/kkos/oniguruma
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/onigurumacffi_build.py 
new/onigurumacffi-1.3.0/onigurumacffi_build.py
--- old/onigurumacffi-1.2.0/onigurumacffi_build.py      2022-05-01 
00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/onigurumacffi_build.py      2023-10-14 
19:00:39.000000000 +0200
@@ -156,12 +156,14 @@
 ffibuilder.cdef(CDEF)
 
 if sys.platform == 'win32':
+    here = os.path.dirname(__file__)
+    clone = os.environ.get('ONIGURUMA_CLONE', os.path.join(here, 'oniguruma'))
     ffibuilder.set_source(
         '_onigurumacffi', SRC,
         libraries=['onig_s'],
         define_macros=[('ONIG_EXTERN', 'extern')],
-        include_dirs=[os.path.join(os.environ['ONIGURUMA_CLONE'], 'src')],
-        library_dirs=[os.environ['ONIGURUMA_CLONE']],
+        include_dirs=[os.path.join(clone, 'src')],
+        library_dirs=[clone],
     )
 else:
     ffibuilder.set_source('_onigurumacffi', SRC, libraries=['onig'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/setup.cfg 
new/onigurumacffi-1.3.0/setup.cfg
--- old/onigurumacffi-1.2.0/setup.cfg   2022-05-01 00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/setup.cfg   2023-10-14 19:00:39.000000000 +0200
@@ -1,6 +1,6 @@
 [metadata]
 name = onigurumacffi
-version = 1.2.0
+version = 1.3.0
 description = python cffi bindings for the oniguruma regex engine
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -8,15 +8,11 @@
 author = Anthony Sottile
 author_email = asott...@umich.edu
 license = MIT
-license_file = LICENSE
+license_files = LICENSE
 classifiers =
     License :: OSI Approved :: MIT License
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
 
@@ -24,7 +20,7 @@
 py_modules = onigurumacffi
 install_requires =
     cffi>=1
-python_requires = >=3.7
+python_requires = >=3.8
 setup_requires =
     cffi>=1
 
@@ -37,7 +33,6 @@
 disallow_any_generics = true
 disallow_incomplete_defs = true
 disallow_untyped_defs = true
-no_implicit_optional = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/onigurumacffi-1.2.0/tox.ini 
new/onigurumacffi-1.3.0/tox.ini
--- old/onigurumacffi-1.2.0/tox.ini     2022-05-01 00:36:22.000000000 +0200
+++ new/onigurumacffi-1.3.0/tox.ini     2023-10-14 19:00:39.000000000 +0200
@@ -1,8 +1,9 @@
 [tox]
-envlist = py37,py38,pypy3,pre-commit
+envlist = py,pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt
+passenv = ONIGURUMA_CLONE
 commands =
     coverage erase
     coverage run -m pytest {posargs:tests}

Reply via email to