pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Forget Python 3.10
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <adam%defguard.net@localhost>
Pushed By: adam
Date: Fri Oct 16 20:43:15 2026 +0200
Changeset: 29e09cc0b70a12533c372fd79143a9a7f7701ab2
Modified Files:
blender/Makefile
opencv/Makefile
py-Uranium/Makefile
py-bokeh/Makefile
py-check-jsonschema/Makefile
py-datamodel-code-generator/Makefile
py-gcalcli/Makefile
py-llama-cpp-scripts/Makefile
py-mbake/Makefile
py-nvchecker/Makefile
py-polars/Makefile
py-sqlelf/Makefile
py-towncrier/Makefile
py-transformers/Makefile
py-trimesh/Makefile
py-zinolib/Makefile
qgis/Makefile
wadgadget/Makefile
zino/Makefile
Log Message:
Forget Python 3.10
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=29e09cc0b70a12533c372fd79143a9a7f7701ab2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
blender/Makefile | 2 +-
opencv/Makefile | 2 +-
py-Uranium/Makefile | 8 ++++----
py-bokeh/Makefile | 22 ++++++++--------------
py-check-jsonschema/Makefile | 7 +------
py-datamodel-code-generator/Makefile | 7 +------
py-gcalcli/Makefile | 29 ++++++++++-------------------
py-llama-cpp-scripts/Makefile | 6 +++---
py-mbake/Makefile | 6 ------
py-nvchecker/Makefile | 19 +++++++------------
py-polars/Makefile | 11 ++---------
py-sqlelf/Makefile | 2 +-
py-towncrier/Makefile | 6 ------
py-transformers/Makefile | 20 ++++++++++----------
py-trimesh/Makefile | 4 ++--
py-zinolib/Makefile | 5 -----
qgis/Makefile | 29 +++++++++++++----------------
wadgadget/Makefile | 2 +-
zino/Makefile | 12 +-----------
19 files changed, 66 insertions(+), 133 deletions(-)
diffs:
diff --git a/blender/Makefile b/blender/Makefile
index da4b41fa43..417c279666 100644
--- a/blender/Makefile
+++ b/blender/Makefile
@@ -59,7 +59,7 @@ PLIST_SUBST+= BLENDERVER=${PKGVERSION_NOREV:R}
REPLACE_PYTHON+= scripts/modules/bl_i18n_utils/merge_po.py
REPLACE_PYTHON+= scripts/modules/blend_render_info.py
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311 314
+PYTHON_VERSIONS_INCOMPATIBLE= 311 314
.include "options.mk"
.include "../../archivers/minizip-ng/buildlink3.mk"
diff --git a/opencv/Makefile b/opencv/Makefile
index 24d5c5ecc8..8b42b547f8 100644
--- a/opencv/Makefile
+++ b/opencv/Makefile
@@ -10,7 +10,7 @@ COMMENT= Library for computer vision problems
PY_PATCHPLIST= yes
REPLACE_PYTHON+= samples/python/*.py
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311
+PYTHON_VERSIONS_INCOMPATIBLE= 311
CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
diff --git a/py-Uranium/Makefile b/py-Uranium/Makefile
index 483ecd1290..c30d85982b 100644
--- a/py-Uranium/Makefile
+++ b/py-Uranium/Makefile
@@ -16,14 +16,14 @@ LICENSE= gnu-lgpl-v3
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
-DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
-DEPENDS+= ${PYPKGPREFIX}-shapely-[0-9]*:../../wip/py-shapely
-DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-shapely>=0:../../wip/py-shapely
+DEPENDS+= ${PYPKGPREFIX}-qt5>=0:../../x11/py-qt5
pre-install:
find ${WRKSRC} -type f -name "*.orig" | xargs ${RM}
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE= 311 # py-numpy
PY_PATCHPLIST=YES
diff --git a/py-bokeh/Makefile b/py-bokeh/Makefile
index fff36e1210..8ca8b9dbab 100644
--- a/py-bokeh/Makefile
+++ b/py-bokeh/Makefile
@@ -10,29 +10,23 @@ HOMEPAGE= https://github.com/bokeh/bokeh
COMMENT= Statistical and novel interactive HTML plots for Python
LICENSE= modified-bsd
-PYTHON_VERSIONS_INCOMPATIBLE= 27 38
-
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=70.0:../../devel/py-setuptools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-git-versioning-[0-9]*:../../wip/py-setuptools-git-versioning
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-git-versioning>=0:../../wip/py-setuptools-git-versioning
DEPENDS+= ${PYPKGPREFIX}-packaging>=16.8:../../devel/py-packaging
-DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions
+DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=0:../../devel/py-typing-extensions
DEPENDS+= ${PYPKGPREFIX}-Pillow>=7.1.0:../../graphics/py-Pillow
DEPENDS+= ${PYPKGPREFIX}-contourpy>=1.2:../../graphics/py-contourpy
DEPENDS+= ${PYPKGPREFIX}-pandas>=1.2:../../math/py-pandas
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-.include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 311
-TOOL_DEPENDS+= ${PYPKGPREFIX}-toml>=0.10.2:../../textproc/py-toml
-.endif
DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-tornado>=6.2:../../www/py-tornado
-TEST_DEPENDS+= ${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout
-TEST_DEPENDS+= ${PYPKGPREFIX}-selenium-[0-9]*:../../www/py-selenium
-TEST_DEPENDS+= geckodriver-[0-9]*:../../www/geckodriver
-TEST_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
+TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=0:../../devel/py-flaky
+TEST_DEPENDS+= ${PYPKGPREFIX}-test>=0:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=0:../../devel/py-test-timeout
+TEST_DEPENDS+= ${PYPKGPREFIX}-selenium>=0:../../www/py-selenium
+TEST_DEPENDS+= geckodriver>=0:../../www/geckodriver
+TEST_DEPENDS+= nodejs>=0:../../lang/nodejs
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m pytest -s
diff --git a/py-check-jsonschema/Makefile b/py-check-jsonschema/Makefile
index ce078e23e0..d5452578ea 100644
--- a/py-check-jsonschema/Makefile
+++ b/py-check-jsonschema/Makefile
@@ -13,14 +13,9 @@ LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-click>=8:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-jsonschema>=4.18.0:../../textproc/py-jsonschema
DEPENDS+= ${PYPKGPREFIX}-regress>=0.4.0:../../wip/py-regress
-DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-requests>=0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.18.5:../../devel/py-ruamel-yaml
-.include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli>=2.0:../../textproc/py-tomli
-.endif
-
USE_LANGUAGES= # none
post-install:
diff --git a/py-datamodel-code-generator/Makefile b/py-datamodel-code-generator/Makefile
index da3e55ad0f..6e5c1ef2aa 100644
--- a/py-datamodel-code-generator/Makefile
+++ b/py-datamodel-code-generator/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://datamodel-code-generator.koxudaxi.dev/
COMMENT= Generate datamodels from OpenAPI, JSON Schema and more
LICENSE= mit
-TOOL_DEPENDS+= ${PYPKGPREFIX}-hatchling-[0-9]*:../../devel/py-hatchling
+TOOL_DEPENDS+= ${PYPKGPREFIX}-hatchling>=0:../../devel/py-hatchling
DEPENDS+= ${PYPKGPREFIX}-argcomplete>=2.10.1:../../devel/py-argcomplete
DEPENDS+= ${PYPKGPREFIX}-black>=19.10:../../textproc/py-black
DEPENDS+= ${PYPKGPREFIX}-genson>=1.2.1:../../wip/py-genson
@@ -19,11 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-isort>=4.3.21:../../devel/py-isort
DEPENDS+= ${PYPKGPREFIX}-pydantic>=2.12:../../devel/py-pydantic
DEPENDS+= ${PYPKGPREFIX}-yaml>=6.0.1:../../textproc/py-yaml
-.include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli>=2.2.1:../../textproc/py-tomli
-.endif
-
USE_LANGUAGES= # none
post-install:
diff --git a/py-gcalcli/Makefile b/py-gcalcli/Makefile
index c4f81adb37..9c3ef025e6 100644
--- a/py-gcalcli/Makefile
+++ b/py-gcalcli/Makefile
@@ -12,26 +12,17 @@ LICENSE= mit
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=64:../../devel/py-setuptools
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=8:../../devel/py-setuptools_scm
-TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-DEPENDS+= ${PYPKGPREFIX}-argcomplete-[0-9]*:../../devel/py-argcomplete
-DEPENDS+= ${PYPKGPREFIX}-babel-[0-9]*:../../devel/py-babel
-DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+DEPENDS+= ${PYPKGPREFIX}-argcomplete>=0:../../devel/py-argcomplete
+DEPENDS+= ${PYPKGPREFIX}-babel>=0:../../devel/py-babel
+DEPENDS+= ${PYPKGPREFIX}-dateutil>=0:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-google-api-python-client>=1.4:../../www/py-google-api-python-client
-DEPENDS+= ${PYPKGPREFIX}-google-auth-oauthlib-[0-9]*:../../security/py-google-auth-oauthlib
-DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
-DEPENDS+= ${PYPKGPREFIX}-parsedatetime-[0-9]*:../../time/py-parsedatetime
-DEPENDS+= ${PYPKGPREFIX}-platformdirs-[0-9]*:../../misc/py-platformdirs
-DEPENDS+= ${PYPKGPREFIX}-pydantic-[0-9]*:../../devel/py-pydantic
-DEPENDS+= ${PYPKGPREFIX}-truststore-[0-9]*:../../security/py-truststore
-
-# Only for Python >=3.10
-PYTHON_VERSIONS_INCOMPATIBLE= 39
-
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
-.endif
+DEPENDS+= ${PYPKGPREFIX}-google-auth-oauthlib>=0:../../security/py-google-auth-oauthlib
+DEPENDS+= ${PYPKGPREFIX}-httplib2>=0:../../www/py-httplib2
+DEPENDS+= ${PYPKGPREFIX}-parsedatetime>=0:../../time/py-parsedatetime
+DEPENDS+= ${PYPKGPREFIX}-platformdirs>=0:../../misc/py-platformdirs
+DEPENDS+= ${PYPKGPREFIX}-pydantic>=0:../../devel/py-pydantic
+DEPENDS+= ${PYPKGPREFIX}-truststore>=0:../../security/py-truststore
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
diff --git a/py-llama-cpp-scripts/Makefile b/py-llama-cpp-scripts/Makefile
index fac8b50c0d..cfdfddb5c5 100644
--- a/py-llama-cpp-scripts/Makefile
+++ b/py-llama-cpp-scripts/Makefile
@@ -16,13 +16,13 @@ DEPENDS+= ${PYPKGPREFIX}-sentencepiece>=0.1.98:../../textproc/py-sentencepiece
DEPENDS+= ${PYPKGPREFIX}-transformers>=0.1.98:../../wip/py-transformers
DEPENDS+= ${PYPKGPREFIX}-protobuf>=4.21.0:../../devel/py-protobuf
DEPENDS+= ${PYPKGPREFIX}-torch>=2.6.0:../../math/py-torch
-DEPENDS+= ${PYPKGPREFIX}-gguf-[0-9]*:../../wip/py-gguf
-TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-gguf>=0:../../wip/py-gguf
+TEST_DEPENDS+= ${PYPKGPREFIX}-requests>=0:../../devel/py-requests
# also needs wget and appium modules, currently unpackaged
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311 314 # py-torch
+PYTHON_VERSIONS_INCOMPATIBLE= 311 314 # py-torch
PY_RENAME_BINARIES+= llama-convert-hf-to-gguf
PY_RENAME_BINARIES+= llama-convert-llama-ggml-to-gguf
diff --git a/py-mbake/Makefile b/py-mbake/Makefile
index c18a05a245..4b109202cc 100644
--- a/py-mbake/Makefile
+++ b/py-mbake/Makefile
@@ -29,12 +29,6 @@ CHECK_PORTABILITY_SKIP+= tests/fixtures/shell_operators/*
# as of 1.4.5
# 2 failed, 209 passed
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli>=1.2.0:../../textproc/py-tomli
-.endif
-
USE_LANGUAGES= # none
post-install:
diff --git a/py-nvchecker/Makefile b/py-nvchecker/Makefile
index c34820ae94..fbe0ae0265 100644
--- a/py-nvchecker/Makefile
+++ b/py-nvchecker/Makefile
@@ -12,13 +12,13 @@ HOMEPAGE= https://github.com/lilydjwg/nvchecker/
COMMENT= New version checker for software releases
LICENSE= mit
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+= ${PYPKGPREFIX}-curl-[0-9]*:../../www/py-curl
-DEPENDS+= ${PYPKGPREFIX}-platformdirs-[0-9]*:../../misc/py-platformdirs
-DEPENDS+= ${PYPKGPREFIX}-structlog-[0-9]*:../../sysutils/py-structlog
-DEPENDS+= ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-asyncio-[0-9]*:../../devel/py-test-asyncio
-TEST_DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
+DEPENDS+= ${PYPKGPREFIX}-curl>=0:../../www/py-curl
+DEPENDS+= ${PYPKGPREFIX}-platformdirs>=0:../../misc/py-platformdirs
+DEPENDS+= ${PYPKGPREFIX}-structlog>=0:../../sysutils/py-structlog
+DEPENDS+= ${PYPKGPREFIX}-tornado>=0:../../www/py-tornado
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-asyncio>=0:../../devel/py-test-asyncio
+TEST_DEPENDS+= ${PYPKGPREFIX}-lxml>=0:../../textproc/py-lxml
USE_LANGUAGES= # none
@@ -28,10 +28,5 @@ ALLOW_NETWORK_ACCESS= yes
# as of 2.20
# 8 failed, 95 passed, 45 skipped, 23 warnings
-.include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
-.endif
-
.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-polars/Makefile b/py-polars/Makefile
index 62fe58a2b5..cce37b6da8 100644
--- a/py-polars/Makefile
+++ b/py-polars/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= polars-0.15.14
-CATEGORIES= math
+CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_PYPI:=p/polars/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -9,10 +9,9 @@ HOMEPAGE= https://www.pola.rs/
COMMENT= Lightning-fast DataFrame library
LICENSE= mit
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
+TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=0:../../devel/py-maturin
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 27
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} maturin-${PYVERSSUFFIX} pep517 \
@@ -21,12 +20,6 @@ do-build:
WHEELFILE= ${WRKSRC}/target/wheels/*.whl
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 310
-DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=4.0:../../devel/py-typing-extensions
-.endif
-
.include "../../lang/python/wheel.mk"
.include "../../lang/rust/cargo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-sqlelf/Makefile b/py-sqlelf/Makefile
index 7f16004f53..1ff4af23dc 100644
--- a/py-sqlelf/Makefile
+++ b/py-sqlelf/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/fzakaria/sqlelf/
COMMENT= Explore ELF objects through the power of SQL
LICENSE= mit
-PYTHON_VERSIONS_ACCEPTED= 311 310
+PYTHON_VERSIONS_ACCEPTED= 311
USE_LANGUAGES= c c++
# TOOL_DEPENDS:
diff --git a/py-towncrier/Makefile b/py-towncrier/Makefile
index c5cee9ecb2..4d4d7aa56e 100644
--- a/py-towncrier/Makefile
+++ b/py-towncrier/Makefile
@@ -23,11 +23,5 @@ USE_LANGUAGES= # none
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-toml>=0:../../textproc/py-toml
-.endif
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-transformers/Makefile b/py-transformers/Makefile
index e707660989..8c4f31caae 100644
--- a/py-transformers/Makefile
+++ b/py-transformers/Makefile
@@ -10,31 +10,31 @@ HOMEPAGE= https://github.com/huggingface/transformers
COMMENT= State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow
LICENSE= apache-2.0
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
#TOOL_DEPENDS+= # TODO: GitPython<3.1.19>=0
#TOOL_DEPENDS+= # TODO: GitPython<3.1.19>=0
-#TOOL_DEPENDS+= ${PYPKGPREFIX}-gitpython-[0-9]*:../../devel/py-gitpython
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-gitpython>=0:../../devel/py-gitpython
#TOOL_DEPENDS+= # TODO: Pillow>=10.0.1,<=15.0
#TOOL_DEPENDS+= # TODO: Pillow>=10.0.1,<=15.0
#TOOL_DEPENDS+= ${PYPKGPREFIX}-Pillow>=10.0.1:../../graphics/py-Pillow
#TOOL_DEPENDS+= # TODO: accelerate>=0.26.0
#TOOL_DEPENDS+= # TODO: accelerate>=0.26.0
-#TOOL_DEPENDS+= ${PYPKGPREFIX}-accelerate-[0-9]*:../../wip/py-accelerate
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-accelerate>=0:../../wip/py-accelerate
#TOOL_DEPENDS+= # TODO: av>=0
#TOOL_DEPENDS+=
#TOOL_DEPENDS+= # TODO: beautifulsoup4>=0
-#TOOL_DEPENDS+= ${PYPKGPREFIX}-beautiulsoup4-[0-9]*:../../www/py-beautifulsoup4
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-beautiulsoup4>=0:../../www/py-beautifulsoup4
#TOOL_DEPENDS+= # TODO: codecarbon>=2.8.1
#TOOL_DEPENDS+=
#TOOL_DEPENDS+= # TODO: cookiecutter==1.7.3>=0
#TOOL_DEPENDS+= # TODO: cookiecutter==1.7.3>=0
-#TOOL_DEPENDS+= ${PYPKGPREFIX}-cookiecutter-[0-9]*:../../devel/py-cookiecutter
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-cookiecutter>=0:../../devel/py-cookiecutter
#TOOL_DEPENDS+= # TODO: datasets>=2.15.0
#TOOL_DEPENDS+= # TODO: datasets>=2.15.0
#TOOL_DEPENDS+= # TODO: datasets>=2.15.0
#TOOL_DEPENDS+=
#TOOL_DEPENDS+= # TODO: dill<0.3.5>=0
-#TOOL_DEPENDS+= ${PYPKGPREFIX}-dill-[0-9]*:../../textproc/py-dill
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-dill>=0:../../textproc/py-dill
#TOOL_DEPENDS+= # TODO: evaluate>=0.2.0
#TOOL_DEPENDS+=
#TOOL_DEPENDS+= # TODO: faiss-cpu>=0
@@ -105,20 +105,20 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
#TOOL_DEPENDS+= # TODO: unidic_lite>=1.0.7
#TOOL_DEPENDS+= # TODO: urllib3<2.0.0>=0
-#DEPENDS+= ${PYPKGPREFIX}-filelock-[0-9]*:../../devel/py-filelock
+#DEPENDS+= ${PYPKGPREFIX}-filelock>=0:../../devel/py-filelock
DEPENDS+= ${PYPKGPREFIX}-huggingface-hub>1.5.0:../../wip/py-huggingface-hub
DEPENDS+= ${PYPKGPREFIX}-numpy>=1.17:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-packaging>=20.0:../../devel/py-packaging
DEPENDS+= ${PYPKGPREFIX}-yaml>=5.1:../../textproc/py-yaml
-DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
-#DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-regex>=0:../../textproc/py-regex
+#DEPENDS+= ${PYPKGPREFIX}-requests>=0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-safetensors>=0.4.3:../../wip/py-safetensors
DEPENDS+= ${PYPKGPREFIX}-tokenizers>=0.22:../../wip/py-tokenizers
DEPENDS+= ${PYPKGPREFIX}-tqdm>=4.27:../../misc/py-tqdm
USE_LANGUAGES= c++
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE= 311 # py-numpy
SCRIPTS= transformers
diff --git a/py-trimesh/Makefile b/py-trimesh/Makefile
index 49e4fbdabd..a619f0f65c 100644
--- a/py-trimesh/Makefile
+++ b/py-trimesh/Makefile
@@ -2,7 +2,7 @@
DISTNAME= trimesh-1.11.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= math
+CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_PYPI:=t/trimesh/}
MAINTAINER= jihbed.research%gmail.com@localhost
@@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-networkx>=1.10:../../math/py-networkx
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 310 311 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE= 311 # py-numpy
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-zinolib/Makefile b/py-zinolib/Makefile
index 17a747736f..bb7e3f64de 100644
--- a/py-zinolib/Makefile
+++ b/py-zinolib/Makefile
@@ -11,15 +11,10 @@ HOMEPAGE= https://github.com/Uninett/zinolib
COMMENT= Library to connect to zino command and notification channels
LICENSE= apache-2.0
-.include "../../lang/python/pyversion.mk"
.include "../../mk/bsd.prefs.mk"
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
-
DEPENDS+= ${PYPKGPREFIX}-pydantic>=2.0:../../devel/py-pydantic
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
-.endif
# Workaround for using github tarball:
MAKE_ENV+= SETUPTOOLS_SCM_PRETEND_VERSION=${PKGVERSION}
diff --git a/qgis/Makefile b/qgis/Makefile
index 82713e05c1..0a03d62278 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -30,19 +30,19 @@ USE_TOOLS+= bison flex perl pkg-config
# minizip/zip.h shadows zip.h (from libzip)
BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include/minizip
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
-TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6>=0:../../x11/py-sip6
+TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder>=0:../../x11/py-qt-builder
# \todo Grasp/fix. Perhaps qca2-qt6 does not need an ossl plugin because it is built in?
-#DEPENDS+= qca2-qt6-ossl-[0-9]*:../../security/qca2-qt6-ossl
-DEPENDS+= ${PYPKGPREFIX}-qt6-[0-9]*:../../x11/py-qt6
-DEPENDS+= ${PYPKGPREFIX}-qt6-qscintilla-[0-9]*:../../x11/py-qt6-qscintilla
+#DEPENDS+= qca2-qt6-ossl>=0:../../security/qca2-qt6-ossl
+DEPENDS+= ${PYPKGPREFIX}-qt6>=0:../../x11/py-qt6
+DEPENDS+= ${PYPKGPREFIX}-qt6-qscintilla>=0:../../x11/py-qt6-qscintilla
# This is needed to find qca2.
CMAKE_PREFIX_PATH+= ${QTDIR}
# This could be used if we want to build pdf doc, which is currently false
-#TOOL_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags
+#TOOL_DEPENDS+= txt2tags>=0:../../wip/txt2tags
# Disable building of QGIS.app. \todo Consider building it.
# \todo Adapt to upstream rototill of mac bundle in 4.0. This is
@@ -108,18 +108,15 @@ CMAKE_CONFIGURE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
# \todo Consider (optional?) dependency on GRASS.
# \todo Consider (optional?) dependency on SAGA.
-DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
-DEPENDS+= ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal
-DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
+DEPENDS+= ${PYPKGPREFIX}-requests>=0:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-psycopg2>=0:../../databases/py-psycopg2
+DEPENDS+= ${PYPKGPREFIX}-gdal>=0:../../geography/py-gdal
+DEPENDS+= ${PYPKGPREFIX}-jinja2>=0:../../textproc/py-jinja2
+DEPENDS+= ${PYPKGPREFIX}-markupsafe>=0:../../textproc/py-markupsafe
# for quickosm
-DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+= ${PYPKGPREFIX}-yaml>=0:../../textproc/py-yaml
# for metasearch
-DEPENDS+= ${PYPKGPREFIX}-owslib-[0-9]*:../../geography/py-owslib
-
-.include "../../lang/python/pyversion.mk"
-PYTHON_VERSIONS_INCOMPATIBLE= 310
+DEPENDS+= ${PYPKGPREFIX}-owslib>=0:../../geography/py-owslib
.include "../../mk/pgsql.buildlink3.mk"
diff --git a/wadgadget/Makefile b/wadgadget/Makefile
index acf228179f..9bb4e70e6d 100644
--- a/wadgadget/Makefile
+++ b/wadgadget/Makefile
@@ -20,7 +20,7 @@ INSTALLATION_DIRS= bin
MAKE_FILE= GNUmakefile
-PYTHON_VERSIONS_ACCEPTED= 313 312 311 310
+PYTHON_VERSIONS_ACCEPTED= 313 312 311
.include "../../lang/python/tool.mk"
.include "../../audio/libsndfile/buildlink3.mk"
diff --git a/zino/Makefile b/zino/Makefile
index f6e77836ac..8961c9d97e 100644
--- a/zino/Makefile
+++ b/zino/Makefile
@@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/Uninett/zino
COMMENT= Interface-centric (+eBGP++) multi-user SNMP-based network monitor
LICENSE= apache-2.0
-.include "../../lang/python/pyversion.mk"
-
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=61.1:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-apscheduler>=3.11:../../wip/py-apscheduler
@@ -19,15 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-pydantic>=2.11:../../devel/py-pydantic
DEPENDS+= ${PYPKGPREFIX}-snmp>=6.2.6<7:../../wip/py-snmp
DEPENDS+= ${PYPKGPREFIX}-aiodns>=3.6.1:../../net/py-aiodns
DEPENDS+= ${PYPKGPREFIX}-netsnmp-cffi>=0.2.1:../../wip/py-netsnmp-cffi
-.if ${PYTHON_VERSION} >= 312
-DEPENDS+= ${PYPKGPREFIX}-pyasyncore-[0-9]*:../../devel/py-pyasyncore
-.endif
-.if ${PYTHON_VERSION} < 311
-DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
-.endif
-
-# Needs python >= 39
-PYTHON_VERSIONS_INCOMPATIBLE+= 27
+DEPENDS+= ${PYPKGPREFIX}-pyasyncore>=0:../../devel/py-pyasyncore
# Workaround for using github tarball:
MAKE_ENV+= SETUPTOOLS_SCM_PRETEND_VERSION=${PKGVERSION}
Home |
Main Index |
Thread Index |
Old Index