On 9/28/22 12:13, Stuart Henderson wrote:
> On 2022/09/28 11:30, Renaud Allard wrote:
>> Hello,
>>
>> Here is a diff for net/synapse. It requires an updated devel/matrix-common.
>>
>> Given the big changes in the package (it now requires rust modules), it
>> might be worth testing early.
>> It is running fine here on amd64.
>
> py-matrix-common diff doesn't apply to -current, we are on 1.2.1 already.
> Updated version below, switching to MODPY_PYBUILD while there.
Ah, yes, sorry, I forgot to do a cvs up. Your diff looks fine.
>
>> Index: Makefile
>
> (btw, if you're sending diffs for multiple ports in one mail, it's
> helpful to run the diff from a common parent directory (/usr/ports in
> this case, sometimes it could be /usr/ports/category) so the reader
> doesn't have to split it up)
>
>> +BUILD_DEPENDS += devel/py-setuptools-rust${MODPY_FLAVOR}
>> +
>> # in same order as in pyproject.toml: mandatory section
>> RUN_DEPENDS = devel/py-jsonschema${MODPY_FLAVOR}>=3.0.0 \
> ...
>> + devel/py-setuptools-rust${MODPY_FLAVOR}>=1.3.0
>
> This should only be a build not run dep.
Actually, it's needed to run, otherwise, you get this:
ERROR:root:Synapse 1.68.0 needs setuptools_rust, but it is not installed
>
>> devel/py-matrix-common${MODPY_FLAVOR}>=1.3.0 \
>
> The version spec for Poetry in the pyproject.toml is 'matrix-common
> = "^1.3.0"' which translates to >=1.3.0,<2.0.0 (for more info see
> https://python-poetry.org/docs/dependency-specification/#caret-requirements)
>
> For ports, the upper bound is usually the more important with version
> specs (unless people are taking shortcuts the lower bound should already
> be satisfied) as that's the one which people are more likely to
> inadvertently bump into.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-matrix-common/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 20 Aug 2022 07:26:56 -0000 1.3
> +++ Makefile 28 Sep 2022 10:07:50 -0000
> @@ -1,6 +1,6 @@
> COMMENT = common utilities for Synapse, Sydent and Sygnal
>
> -MODPY_EGG_VERSION = 1.2.1
> +MODPY_EGG_VERSION = 1.3.0
>
> DISTNAME = matrix_common-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> @@ -15,8 +15,7 @@ PERMIT_PACKAGE = Yes
> MODULES = lang/python
>
> MODPY_PI = Yes
> -MODPY_SETUPTOOLS = Yes
> -MODPY_PYTEST = Yes
> +MODPY_PYBUILD = setuptools
>
> FLAVORS = python3
> FLAVOR = python3
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-matrix-common/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 20 Aug 2022 07:26:56 -0000 1.2
> +++ distinfo 28 Sep 2022 10:07:50 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (matrix_common-1.2.1.tar.gz) = qZ3PAqa9lbJKWmGzVIiKKskr8rS4OccnuN2dos36OFM=
> -SIZE (matrix_common-1.2.1.tar.gz) = 9709
> +SHA256 (matrix_common-1.3.0.tar.gz) = YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E=
> +SIZE (matrix_common-1.3.0.tar.gz) = 12157
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-matrix-common/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 18:52:48 -0000 1.2
> +++ pkg/PLIST 28 Sep 2022 10:07:50 -0000
> @@ -1,15 +1,26 @@
> lib/python${MODPY_VERSION}/site-packages/matrix_common/
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> -lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/LICENSE
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/RECORD
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/WHEEL
> +lib/python${MODPY_VERSION}/site-packages/matrix_common-${MODPY_EGG_VERSION}.dist-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/matrix_common/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}versionstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/matrix_common/${MODPY_PYCACHE}versionstring.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/matrix_common/py.typed
> lib/python${MODPY_VERSION}/site-packages/matrix_common/regex.py
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/matrix_common/types/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/${MODPY_PYCACHE}mxc_uri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/${MODPY_PYCACHE}mxc_uri.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/matrix_common/types/mxc_uri.py
> lib/python${MODPY_VERSION}/site-packages/matrix_common/versionstring.py
>
No comments:
Post a Comment