From bed4596d9d5e9c0a8450bd3cd869e767434a8e4d Mon Sep 17 00:00:00 2001 From: bnavigator <> Date: Mar 24 2025 13:14:40 +0000 Subject: Update python-pycrdt to version 0.12.9 / rev 8 via SR 1255116 https://build.opensuse.org/request/show/1255116 by user bnavigator + anag+factory - Update to 0.12.9 * Upgrade pyo3 to v0.24.0. - Refresh pycrdt-pr227-trio0.28.patch to pycrdt-pr246-trio-0.30.patch --- diff --git a/.files b/.files index 830b410..ebb0d86 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 377864f..4178999 100644 --- a/.rev +++ b/.rev @@ -102,4 +102,15 @@ @ColonelThirtyTwo).</comment> <requestid>1241449</requestid> </revision> + <revision rev="8" vrev="1"> + <srcmd5>8e1d90e104ec8b59bc5983c58927397b</srcmd5> + <version>0.12.9</version> + <time>1742819356</time> + <user>anag+factory</user> + <comment>- Update to 0.12.9 + * Upgrade pyo3 to v0.24.0. +- Refresh pycrdt-pr227-trio0.28.patch to + pycrdt-pr246-trio-0.30.patch</comment> + <requestid>1255116</requestid> + </revision> </revisionlist> diff --git a/_service b/_service index cae8011..d6d7ccc 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="revision">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="versionrewrite-pattern">v(.*)</param> + <param name="versionrewrite-pattern">(.*)</param> <param name="versionrewrite-replacement">\1</param> </service> <service mode="disabled" name="tar" /> diff --git a/pycrdt-0.12.7.tar.xz b/pycrdt-0.12.7.tar.xz deleted file mode 120000 index e216239..0000000 --- a/pycrdt-0.12.7.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreie7nd22bfcrgdeyhw27rqzb4c2z472gbcmfangkvhdeyfrw3bqc5q \ No newline at end of file diff --git a/pycrdt-0.12.9.tar.xz b/pycrdt-0.12.9.tar.xz new file mode 120000 index 0000000..e4d6c9d --- /dev/null +++ b/pycrdt-0.12.9.tar.xz @@ -0,0 +1 @@ +/ipfs/bafkreihfshxilutrbyu6r44pqra62syjxwl72we7bpohs5rv4lqfo4uthy \ No newline at end of file diff --git a/pycrdt-pr227-trio0.28.patch b/pycrdt-pr227-trio0.28.patch deleted file mode 100644 index 059543f..0000000 --- a/pycrdt-pr227-trio0.28.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 238396359d6f4e67db0269c5554ce2701674cc50 Mon Sep 17 00:00:00 2001 -From: Ben Greiner <code@bnavigator.de> -Date: Thu, 30 Jan 2025 17:49:28 +0100 -Subject: [PATCH] Bump trio upper version to <0.29 - ---- - .github/workflows/publish.yml | 8 ++++---- - pyproject.toml | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml -index 39a3a25..8f3f504 100644 ---- a/.github/workflows/publish.yml -+++ b/.github/workflows/publish.yml -@@ -31,7 +31,7 @@ jobs: - args: --release --target universal2-apple-darwin --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 - - name: Test built wheel - universal2 - run: | -- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.26" "exceptiongroup; python_version<'3.11'" -+ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" - pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall - pytest - - name: Upload wheels -@@ -64,7 +64,7 @@ jobs: - args: --release --out dist -i ${{ matrix.platform.interpreter }} - - name: Test built wheel - run: | -- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.26" "exceptiongroup; python_version<'3.11'" -+ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" - pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall - pytest - - name: Upload wheels -@@ -100,7 +100,7 @@ jobs: - - name: Test built wheel - if: matrix.target == 'x86_64' - run: | -- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.26" "exceptiongroup; python_version<'3.11'" -+ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" - pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall - pytest - - name: Upload wheels -@@ -136,7 +136,7 @@ jobs: - install: | - apt-get update - apt-get install -y --no-install-recommends python3 python3-pip -- pip3 install -U pip pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.26" "exceptiongroup; python_version<'3.11'" -+ pip3 install -U pip pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" - run: | - pip3 install pycrdt --no-deps --no-index --find-links dist/ --force-reinstall - pytest -diff --git a/pyproject.toml b/pyproject.toml -index a520aa6..65c3a4c 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -40,7 +40,7 @@ test = [ - "pytest >=7.4.2,<8", - "pytest-mypy-testing", - "anyio", -- "trio >=0.25.1,<0.27", -+ "trio >=0.25.1,<0.29", - "pydantic >=2.5.2,<3", - "mypy", - "coverage[toml] >=7", diff --git a/pycrdt-pr246-trio-0.30.patch b/pycrdt-pr246-trio-0.30.patch new file mode 100644 index 0000000..01975cb --- /dev/null +++ b/pycrdt-pr246-trio-0.30.patch @@ -0,0 +1,63 @@ +From e23cab275eacdf677baaf9c8ea2f018e56602ec4 Mon Sep 17 00:00:00 2001 +From: Ben Greiner <code@bnavigator.de> +Date: Fri, 21 Mar 2025 21:29:06 +0100 +Subject: [PATCH] Bump trio to <0.30 + +--- + .github/workflows/publish.yml | 8 ++++---- + pyproject.toml | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml +index 8f3f504..f4b071a 100644 +--- a/.github/workflows/publish.yml ++++ b/.github/workflows/publish.yml +@@ -31,7 +31,7 @@ jobs: + args: --release --target universal2-apple-darwin --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 + - name: Test built wheel - universal2 + run: | +- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" ++ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.30" "exceptiongroup; python_version<'3.11'" + pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall + pytest + - name: Upload wheels +@@ -64,7 +64,7 @@ jobs: + args: --release --out dist -i ${{ matrix.platform.interpreter }} + - name: Test built wheel + run: | +- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" ++ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.30" "exceptiongroup; python_version<'3.11'" + pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall + pytest + - name: Upload wheels +@@ -100,7 +100,7 @@ jobs: + - name: Test built wheel + if: matrix.target == 'x86_64' + run: | +- pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" ++ pip install pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.30" "exceptiongroup; python_version<'3.11'" + pip install pycrdt --no-deps --no-index --find-links dist --force-reinstall + pytest + - name: Upload wheels +@@ -136,7 +136,7 @@ jobs: + install: | + apt-get update + apt-get install -y --no-install-recommends python3 python3-pip +- pip3 install -U pip pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.29" "exceptiongroup; python_version<'3.11'" ++ pip3 install -U pip pytest pytest-mypy-testing "pydantic>=2.5.2,<3" "anyio>=4.4.0,<5" "trio>=0.25.1,<0.30" "exceptiongroup; python_version<'3.11'" + run: | + pip3 install pycrdt --no-deps --no-index --find-links dist/ --force-reinstall + pytest +diff --git a/pyproject.toml b/pyproject.toml +index eaa19f6..c73d7fd 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -40,7 +40,7 @@ test = [ + "pytest >=7.4.2,<8", + "pytest-mypy-testing", + "anyio", +- "trio >=0.25.1,<0.29", ++ "trio >=0.25.1,<0.30", + "pydantic >=2.5.2,<3", + "mypy", + "coverage[toml] >=7", diff --git a/pycrdt.obsinfo b/pycrdt.obsinfo index 0c84e5c..112a929 100644 --- a/pycrdt.obsinfo +++ b/pycrdt.obsinfo @@ -1,4 +1,4 @@ name: pycrdt -version: 0.12.7 -mtime: 1737630432 -commit: 7d8b4019e5117e12cbd02e83c8f63dfc303f0cd0 +version: 0.12.9 +mtime: 1741595026 +commit: 30ab4e244eec78dcfc65c001e7b407226befc026 diff --git a/python-pycrdt.changes b/python-pycrdt.changes index 4ca685b..86deeb9 100644 --- a/python-pycrdt.changes +++ b/python-pycrdt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Mar 21 20:24:41 UTC 2025 - Ben Greiner <code@bnavigator.de> + +- Update to 0.12.9 + * Upgrade pyo3 to v0.24.0. +- Refresh pycrdt-pr227-trio0.28.patch to + pycrdt-pr246-trio-0.30.patch + +------------------------------------------------------------------- Thu Jan 30 16:54:41 UTC 2025 - Ben Greiner <code@bnavigator.de> - Add pycrdt-pr227-trio0.28.patch gh#jupyter-server/pycrdt#227 diff --git a/python-pycrdt.spec b/python-pycrdt.spec index 9710bd3..8d6125a 100644 --- a/python-pycrdt.spec +++ b/python-pycrdt.spec @@ -17,15 +17,15 @@ Name: python-pycrdt -Version: 0.12.7 +Version: 0.12.9 Release: 0 Summary: Python bindings for Yrs License: MIT URL: https://github.com/jupyter-server/pycrdt Source0: pycrdt-%{version}.tar.xz Source1: vendor.tar.xz -# PATCH-FIX-UPSTREAM pycrdt-pr227-trio0.28.patch gh#jupyter-server/pycrdt#227 -Patch0: pycrdt-pr227-trio0.28.patch +# PATCH-FIX-UPSTREAM pycrdt-pr246-trio-0.30.patch gh#jupyter-server/pycrdt#246 +Patch0: pycrdt-pr246-trio-0.30.patch BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module maturin >= 1.4.0} BuildRequires: %{python_module pip} @@ -39,7 +39,7 @@ BuildRequires: %{python_module pytest >= 7.4.2} BuildRequires: %{python_module anyio >= 4.4.0 with %python-anyio < 5} BuildRequires: %{python_module exceptiongroup if %python-base < 3.11} BuildRequires: %{python_module importlib-metadata >= 3.6 if %python-base < 3.10} -BuildRequires: %{python_module trio >= 0.25.1 with %python-trio < 0.29} +BuildRequires: %{python_module trio >= 0.25.1 with %python-trio < 0.30} # /SECTION %python_subpackages diff --git a/vendor.tar.xz b/vendor.tar.xz index 55d1903..7945efc 120000 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1 +1 @@ -/ipfs/bafybeibuv5eqqd3n4vew5kdfdsqpkaxxsiv3zp424o6mjrougzwqoqto6y \ No newline at end of file +/ipfs/bafybeihxaalfczywp3vfjk3s4qgbnzseinvw6mwnex4fzt3rmbqkd67yea \ No newline at end of file