Compare commits
4 Commits
0905edf3e4
...
b641e23d47
Author | SHA1 | Date | |
---|---|---|---|
|
b641e23d47 | ||
|
d746d9773a | ||
|
a14152e1bc | ||
|
1063ee1ce9 |
@ -0,0 +1,114 @@
|
|||||||
|
From c0be008217350f03de7f856866a402d95b5db2a3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alfred Wingate <parona@protonmail.com>
|
||||||
|
Date: Tue, 21 Nov 2023 15:13:35 +0200
|
||||||
|
Subject: [PATCH] Move metadata to project.toml
|
||||||
|
|
||||||
|
* Setuptools 69.0.0 deprecated a slew of old style configurations.
|
||||||
|
|
||||||
|
Signed-off-by: Alfred Wingate <parona@protonmail.com>
|
||||||
|
---
|
||||||
|
python/olm/__version__.py | 9 ---------
|
||||||
|
python/pyproject.toml | 14 +++++++++++---
|
||||||
|
python/setup.cfg | 3 ---
|
||||||
|
python/setup.py | 29 +----------------------------
|
||||||
|
4 files changed, 12 insertions(+), 43 deletions(-)
|
||||||
|
delete mode 100644 python/olm/__version__.py
|
||||||
|
|
||||||
|
diff --git a/python/olm/__version__.py b/python/olm/__version__.py
|
||||||
|
deleted file mode 100644
|
||||||
|
index a3144ae..0000000
|
||||||
|
--- a/python/olm/__version__.py
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,9 +0,0 @@
|
||||||
|
-__title__ = "python-olm"
|
||||||
|
-__description__ = ("python CFFI bindings for the olm "
|
||||||
|
- "cryptographic ratchet library")
|
||||||
|
-__url__ = "https://gitlab.matrix.org/matrix-org/olm/-/tree/master/python"
|
||||||
|
-__version__ = "3.2.15"
|
||||||
|
-__author__ = "Damir Jelić"
|
||||||
|
-__author_email__ = "poljar@termina.org.uk"
|
||||||
|
-__license__ = "Apache 2.0"
|
||||||
|
-__copyright__ = "Copyright 2018-2019 Damir Jelić, 2019-2023 The Matrix.org Foundation C.I.C."
|
||||||
|
diff --git a/python/pyproject.toml b/python/pyproject.toml
|
||||||
|
index 3416456..1db7b7d 100644
|
||||||
|
--- a/python/pyproject.toml
|
||||||
|
+++ b/python/pyproject.toml
|
||||||
|
@@ -1,14 +1,22 @@
|
||||||
|
+[build-system]
|
||||||
|
+requires = ["setuptools", "cffi>=1.0.0"]
|
||||||
|
+build-backend = "setuptools.build_meta"
|
||||||
|
+
|
||||||
|
[project]
|
||||||
|
name = "python-olm"
|
||||||
|
version = "3.2.15"
|
||||||
|
description = "python CFFI bindings for the olm cryptographic ratchet library"
|
||||||
|
authors = [{name = "Damir Jelić", email = "poljar@termina.org.uk"}]
|
||||||
|
+license = {text = "Apache-2.0"}
|
||||||
|
+readme = "README.md"
|
||||||
|
classifiers = [
|
||||||
|
"License :: OSI Approved :: Apache Software License",
|
||||||
|
"Topic :: Communications",
|
||||||
|
]
|
||||||
|
dependencies = ["cffi>=1.0.0"]
|
||||||
|
|
||||||
|
-[build-system]
|
||||||
|
-requires = ["setuptools", "cffi>=1.0.0"]
|
||||||
|
-build-backend = "setuptools.build_meta"
|
||||||
|
+[project.urls]
|
||||||
|
+homepage = "https://gitlab.matrix.org/matrix-org/olm/-/tree/master/python"
|
||||||
|
+
|
||||||
|
+[tool.setuptools]
|
||||||
|
+packages = [ "olm" ]
|
||||||
|
diff --git a/python/setup.cfg b/python/setup.cfg
|
||||||
|
index d10b7e4..1be5f25 100644
|
||||||
|
--- a/python/setup.cfg
|
||||||
|
+++ b/python/setup.cfg
|
||||||
|
@@ -3,6 +3,3 @@ testpaths = tests
|
||||||
|
flake8-ignore =
|
||||||
|
olm/*.py F401
|
||||||
|
tests/*.py W503
|
||||||
|
-
|
||||||
|
-[coverage:run]
|
||||||
|
-omit=olm/__version__.py
|
||||||
|
diff --git a/python/setup.py b/python/setup.py
|
||||||
|
index 3314b8a..4f52965 100644
|
||||||
|
--- a/python/setup.py
|
||||||
|
+++ b/python/setup.py
|
||||||
|
@@ -1,33 +1,6 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
-
|
||||||
|
-import os
|
||||||
|
-from codecs import open
|
||||||
|
-
|
||||||
|
from setuptools import setup
|
||||||
|
|
||||||
|
-here = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
-
|
||||||
|
-about = {}
|
||||||
|
-with open(os.path.join(here, "olm", "__version__.py"), "r", "utf-8") as f:
|
||||||
|
- exec(f.read(), about)
|
||||||
|
-
|
||||||
|
setup(
|
||||||
|
- name=about["__title__"],
|
||||||
|
- version=about["__version__"],
|
||||||
|
- description=about["__description__"],
|
||||||
|
- author=about["__author__"],
|
||||||
|
- author_email=about["__author_email__"],
|
||||||
|
- url=about["__url__"],
|
||||||
|
- license=about["__license__"],
|
||||||
|
- packages=["olm"],
|
||||||
|
- setup_requires=["cffi>=1.0.0"],
|
||||||
|
- cffi_modules=["olm_build.py:ffibuilder"],
|
||||||
|
- install_requires=[
|
||||||
|
- "cffi>=1.0.0",
|
||||||
|
- "typing;python_version<'3.5'"
|
||||||
|
- ],
|
||||||
|
- zip_safe=False,
|
||||||
|
- package_data={
|
||||||
|
- "olm": ["py.typed"]
|
||||||
|
- }
|
||||||
|
+ cffi_modules=["olm_build.py:ffibuilder"]
|
||||||
|
)
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
@ -38,3 +38,14 @@ EPYTEST_DESELECT=(
|
|||||||
"tests/group_session_test.py::TestClass::test_encrypt"
|
"tests/group_session_test.py::TestClass::test_encrypt"
|
||||||
"tests/group_session_test.py::TestClass::test_decrypt"
|
"tests/group_session_test.py::TestClass::test_decrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/python-olm-3.2.15-move-metadata-to-pyproject.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
pushd "${WORKDIR}/olm-${PV}" > /dev/null || die
|
||||||
|
eapply "${PATCHES[@]}"
|
||||||
|
eapply_user
|
||||||
|
popd > /dev/null || die
|
||||||
|
}
|
@ -1 +1 @@
|
|||||||
DIST pantalaimon-0.10.4.tar.gz 2495386 BLAKE2B edb8c38412448b8a37c9554efe577ca7519262d030f320a090c3d4ca23c197eabccb0253c9d5154776ce263a053f7a585ffed773b53e2a8555a588e1ce4b6483 SHA512 59b3fd27d653a5dedebb9354245e7cb1864792b523cf45696035a327a5946d6ce43a5c97bef301093897265f390dca05e9b68927d8c816de494a83301b05e9bd
|
DIST pantalaimon-0.10.5.tar.gz 2495662 BLAKE2B 3e6214e81929c3a35409075aa7f9c4d23cb822f0b5934b2b2b5382fa6459aa42884d2637b6416ce19c57874dfb1b25a46e47f2467849ae7c810aa48cb206b9d7 SHA512 8648037b49aeae9cdc10eaa83257412335267e70163d8800979a47b3c4bfa88d03a5a62272bddfdf1a77b8ea781b089512b6edae0f8ec67a36b28c1098f1d36e
|
||||||
|
@ -1,19 +1,22 @@
|
|||||||
# Copyright 2021-2022 Gentoo Authors
|
# Copyright 2021-2023 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{9..10} )
|
DISTUTILS_USE_PEP517=setuptools
|
||||||
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
inherit distutils-r1
|
inherit distutils-r1
|
||||||
|
|
||||||
DESCRIPTION="A Matrix proxy daemon that adds E2E encryption capabilities"
|
DESCRIPTION="A Matrix proxy daemon that adds E2E encryption capabilities"
|
||||||
HOMEPAGE="https://github.com/matrix-org/pantalaimon"
|
HOMEPAGE="https://github.com/matrix-org/pantalaimon"
|
||||||
|
# tests not included in sdist
|
||||||
SRC_URI="https://github.com/matrix-org/pantalaimon/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
SRC_URI="https://github.com/matrix-org/pantalaimon/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
LICENSE="Apache-2.0"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="~amd64"
|
KEYWORDS="~amd64"
|
||||||
|
|
||||||
|
# lets relax dbus-python, matrix-nio and pygobject
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
|
>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
|
||||||
>=dev-python/aiohttp-3.6[${PYTHON_USEDEP}]
|
>=dev-python/aiohttp-3.6[${PYTHON_USEDEP}]
|
||||||
@ -21,24 +24,20 @@ RDEPEND="
|
|||||||
>=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
|
>=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
|
||||||
>=dev-python/cachetools-3.0.0[${PYTHON_USEDEP}]
|
>=dev-python/cachetools-3.0.0[${PYTHON_USEDEP}]
|
||||||
>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
|
>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
|
||||||
>=dev-python/dbus-python-1.2[${PYTHON_USEDEP}]
|
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||||
<dev-python/dbus-python-1.3[${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/janus-0.5[${PYTHON_USEDEP}]
|
>=dev-python/janus-0.5[${PYTHON_USEDEP}]
|
||||||
>=dev-python/keyring-21.2.1[${PYTHON_USEDEP}]
|
>=dev-python/keyring-21.2.1[${PYTHON_USEDEP}]
|
||||||
>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
|
>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
|
||||||
>=dev-python/matrix-nio-0.18[e2e(+),${PYTHON_USEDEP}]
|
dev-python/matrix-nio[e2e(+),${PYTHON_USEDEP}]
|
||||||
<dev-python/matrix-nio-0.20[e2e(+),${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
|
>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
|
||||||
<dev-python/notify2-0.4[${PYTHON_USEDEP}]
|
<dev-python/notify2-0.4[${PYTHON_USEDEP}]
|
||||||
>=dev-python/peewee-3.13.1[${PYTHON_USEDEP}]
|
>=dev-python/peewee-3.13.1[${PYTHON_USEDEP}]
|
||||||
>dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
|
>=dev-python/prompt-toolkit-3[${PYTHON_USEDEP}]
|
||||||
<dev-python/prompt_toolkit-4[${PYTHON_USEDEP}]
|
<dev-python/prompt-toolkit-4[${PYTHON_USEDEP}]
|
||||||
>=dev-python/pydbus-0.6[${PYTHON_USEDEP}]
|
>=dev-python/pydbus-0.6[${PYTHON_USEDEP}]
|
||||||
<dev-python/pydbus-0.7[${PYTHON_USEDEP}]
|
<dev-python/pydbus-0.7[${PYTHON_USEDEP}]
|
||||||
>=dev-python/pygobject-3.36[${PYTHON_USEDEP}]
|
dev-python/pygobject[${PYTHON_USEDEP}]
|
||||||
"
|
"
|
||||||
# lets relax the dependency
|
|
||||||
# <dev-python/pygobject-3.40[${PYTHON_USEDEP}]
|
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
test? (
|
test? (
|
||||||
${RDEPEND}
|
${RDEPEND}
|
@ -9,4 +9,3 @@ games-fps/quake15
|
|||||||
games-rpg/fallout1
|
games-rpg/fallout1
|
||||||
games-util/lgogdownloader-export-credentials
|
games-util/lgogdownloader-export-credentials
|
||||||
net-analyzer/sensu
|
net-analyzer/sensu
|
||||||
net-im/pantalaimon
|
|
||||||
|
Loading…
Reference in New Issue
Block a user