Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion c-blosc2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external c-blosc2 3.2.1
### RPM external c-blosc2 3.3.3
Source: https://github.com/Blosc/c-blosc2/archive/refs/tags/v%{realversion}.tar.gz
Requires: zlib zstd lz4
BuildRequires: ninja cmake
Expand Down
13 changes: 0 additions & 13 deletions patches/pip/Pygments-cpp-extension-fix.patch

This file was deleted.

32 changes: 32 additions & 0 deletions patches/pip/backcall-flit-core-4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff --git a/pyproject.toml b/pyproject.toml
index 21c0b58..8d32949 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,16 +1,20 @@
[build-system]
-requires = ["flit_core >=2,<4"]
+requires = ["flit_core >=3.2,<5"]
build-backend = "flit_core.buildapi"

-[tool.flit.metadata]
-module = "backcall"
-author = "Thomas Kluyver"
-author-email = "thomas@kluyver.me.uk"
-home-page = "https://github.com/takluyver/backcall"
-description-file = "README.rst"
+[project]
+name = "backcall"
+authors = [
+ {name = "Thomas Kluyver", email = "thomas@kluyver.me.uk" },
+]
+readme = "README.rst"
+dynamic = ["version", "description"]
classifiers = [
'License :: OSI Approved :: BSD License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
]
+
+[project.urls]
+Homepage = "https://github.com/takluyver/backcall"
42 changes: 42 additions & 0 deletions patches/pip/cloudpickle-flit-core-4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/pyproject.toml b/pyproject.toml
index aaee1f0c..ff8ecc23 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,19 +1,19 @@
[build-system]
-requires = ["flit_core"]
+requires = ["flit_core >=3.2,<5"]
build-backend = "flit_core.buildapi"

-[tool.flit.metadata]
-module = "cloudpickle"
-author = "The cloudpickle developer team"
-author-email='cloudpipe@googlegroups.com'
-home-page = "https://github.com/cloudpipe/cloudpickle"
-description-file = "README.md"
+[project]
+name = "cloudpickle"
+authors = [
+ { name = "The cloudpickle developer team", email = "cloudpipe@googlegroups.com" },
+]
+readme = "README.md"
requires-python = ">=3.8"
license = "BSD-3-Clause"
+dynamic = ["version", "description"]
classifiers = [
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
- 'License :: OSI Approved :: BSD License',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',
@@ -31,6 +31,9 @@ classifiers = [
'Topic :: System :: Distributed Computing',
]

+[project.urls]
+Homepage = "https://github.com/cloudpipe/cloudpickle"
+
[tool.black]
line-length = 88
target_version = ['py38', 'py39', 'py310', 'py311', 'py312', 'py313']
55 changes: 55 additions & 0 deletions patches/pip/entrypoints-flit-core-4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3c8491d..07d75ea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ]
+ python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev" ]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v7

- name: Setup Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

diff --git a/pyproject.toml b/pyproject.toml
index 1279b10..810224a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,18 +1,20 @@
[build-system]
-requires = ["flit_core >=2,<4"]
+requires = ["flit_core >=2,<5"]
build-backend = "flit_core.buildapi"

-[tool.flit.metadata]
-module = "entrypoints"
-author = "Thomas Kluyver"
-author-email = "thomas@kluyver.me.uk"
-home-page = "https://github.com/takluyver/entrypoints"
-description-file = "README.rst"
+[project]
+name = "entrypoints"
+authors = [
+ { name = "Thomas Kluyver", email = "thomas@kluyver.me.uk" },
+]
+readme = "README.rst"
+license = "MIT"
+requires-python = ">=3.6"
+dynamic = ["version", "description"]
classifiers = [
- "License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3"
]
-requires-python = ">=3.6"

-[tool.flit.metadata.urls]
+[project.urls]
+Homepage = "https://github.com/takluyver/entrypoints"
Documentation = "https://entrypoints.readthedocs.io/en/latest/"
43 changes: 5 additions & 38 deletions patches/pip/grpcio-absl-path.patch
Original file line number Diff line number Diff line change
@@ -1,46 +1,13 @@
diff --git a/setup.py b/setup.py
index 72e13c8..832ae73 100644
index 7662934..f9eec52 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,6 @@ import sys
import sysconfig

import _metadata
-import pkg_resources
from setuptools import Extension
from setuptools.command import egg_info

@@ -473,22 +472,6 @@ if "linux" in sys.platform or "darwin" in sys.platform:
DEFINE_MACROS += (("PyMODINIT_FUNC", pymodinit),)
DEFINE_MACROS += (("GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK", 1),)

-# By default, Python3 distutils enforces compatibility of
-# c plugins (.so files) with the OSX version Python was built with.
-# We need OSX 10.10, the oldest which supports C++ thread_local.
-# Python 3.9: Mac OS Big Sur sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') returns int (11)
-if "darwin" in sys.platform:
- mac_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
- if mac_target:
- mac_target = pkg_resources.parse_version(str(mac_target))
- if mac_target < pkg_resources.parse_version("10.10.0"):
- os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.10"
- os.environ["_PYTHON_HOST_PLATFORM"] = re.sub(
- r"macosx-[0-9]+\.[0-9]+-(.+)",
- r"macosx-10.10-\1",
- sysconfig.get_platform(),
- )
-

def cython_extensions_and_necessity():
cython_module_files = [
--- a/setup.py 2024-02-14 12:21:26.788212443 +0100
+++ b/setup.py 2024-02-14 14:00:46.036665638 +0100
@@ -378,7 +378,7 @@
EXTENSION_LIBRARIES += ("re2",)
@@ -403,7 +403,7 @@ if BUILD_WITH_SYSTEM_RE2:
if BUILD_WITH_SYSTEM_ABSL:
EXTENSION_LIBRARIES += tuple(
- lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so")
+ lib.stem[3:] for lib in pathlib.Path(os.getenv("ABSEIL_CPP_ROOT")).glob("lib*/libabsl_*.so")
lib.stem[3:]
- for lib in sorted(pathlib.Path("/usr").glob("lib*/libabsl_*.so"))
+ for lib in pathlib.Path(os.getenv("ABSEIL_CPP_ROOT")).glob("lib*/libabsl_*.so")
)

DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
177 changes: 0 additions & 177 deletions patches/pip/grpcio-tools-pkg_resources.patch

This file was deleted.

Loading