From nobody Mon Apr 03 15:22:07 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pqvl41RVzz42ssG; Mon, 3 Apr 2023 15:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pqvl40PgCz49T3; Mon, 3 Apr 2023 15:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680535328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrsbDgHxrNSSIUAvd0/99PfiGNY4ZOW7G9vDMcdetE0=; b=jljoaBDMMijres14TDzOmtOICt2nEUDa/dJhzz9petKnsRnbgo0gGbCoAcJpkQOsRIw7wz +EY/HwV1YKudpdbkLXVlOBEAdWdpI020OUBeF5s/rx/4NXixnEOatOD/ElvseMt6xtuBcj GImvx/yyZT2MHS+1haDTgcFH/jKJtCitbPEl2kOAmPObpzRlRipzqqfd6xH6g5jg7nKY+v OAloTZCMmq4okiS1fu7fpWCbacBC97r/0RZ8gkcJYaewhyWh2iozPn6LvIeWXo+5f31X4/ zMtHEb3ek6nMV1Qq4/snUvYs5UV9g+v47ZitBc5BzfX+wi+XWvdkEQ6Nnh1u2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680535328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrsbDgHxrNSSIUAvd0/99PfiGNY4ZOW7G9vDMcdetE0=; b=ZGzwhUPtTzXx0E2csn1zr5PxN6X+r+wUB3fo17zrG5RKZGAh6oqC1ZgDYbbYxvFxW5zVu3 MJnRNd2RwFSZJW652yR/DxHlH6Xe5/jR/7wpSYlxEI4tK6OxTHOoZrYlY8QgCgyQ8ItvCG VDiCwoimFzxfxCKwMgKnpc8599+HbUmvn0bUFDecbIfdsUYD231NBkLEovpnw9VKb2Si+A 4jw5Fkt8iYHX+E3f+d4I3hI3wAR9a9bE0gBwYcvh15SKZ8xj6WQT/i+oetzQRO6G4xTevJ NfB5pTRI0cZ6ONYdb91hdVl45wDvtProCfb/AuyKDLcL4I7Zll7TIDYWpLXbDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680535328; a=rsa-sha256; cv=none; b=h148wJqli+f/PRiawncaemYaFJTwMZucyqXT4/mlBeplXy/XTzWuFDufRsp1VFZ2zLrUmH ibJxEnaO+VywVnckVC28UdmN6IokOc72VgEQl8Vx0d4rvYeWBGy2oYxrRjUYTyOGkeXyIx SJL6d0j2hVgSpQsqR3Ck9rK1C05GDsV6Xd1QMpFVK0gaytb6WHCDYL1wF3b/aZfWyWf0uq ERT8mraBBGpYuTo45pxLvM0YddY7pY29IWVjILvEqHqgTIk6kvKShF3XMFNlpLwPjlkrDG tRUk6+h8PAAhO1D1892fZXKKqhGz5WIjPbdOxPG5CuEEKGLn7v++ns9nE0Wgmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pqvl36ZNZz13Hy; Mon, 3 Apr 2023 15:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 333FM706028484; Mon, 3 Apr 2023 15:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333FM7C7028483; Mon, 3 Apr 2023 15:22:07 GMT (envelope-from git) Date: Mon, 3 Apr 2023 15:22:07 GMT Message-Id: <202304031522.333FM7C7028483@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 0780a2be805d - main - devel/py-stevedore: Update to 5.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0780a2be805d9d57d0e395ab62eceac005940bf4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=0780a2be805d9d57d0e395ab62eceac005940bf4 commit 0780a2be805d9d57d0e395ab62eceac005940bf4 Author: Nicola Vitale AuthorDate: 2023-04-03 15:16:49 +0000 Commit: Nicola Vitale CommitDate: 2023-04-03 15:16:49 +0000 devel/py-stevedore: Update to 5.0.0 - Add a set of patches for supporting Python 3.7 until 2023-06-27 when lang/python37 expires. [1] Those patches are taken from: https ://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 PR: 270608 Reported by: Jonathan Chen [1] --- devel/py-stevedore/Makefile | 4 ++-- devel/py-stevedore/distinfo | 6 +++--- .../py-stevedore/files/patch-stevedore___cache.py | 25 ++++++++++++++++++++++ .../files/patch-stevedore_tests_test__driver.py | 18 ++++++++++++++++ .../files/patch-stevedore_tests_test__extension.py | 21 ++++++++++++++++++ .../files/patch-stevedore_tests_test__sphinxext.py | 18 ++++++++++++++++ 6 files changed, 87 insertions(+), 5 deletions(-) diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile index 32fe1df61a5a..ea1bf82cd33c 100644 --- a/devel/py-stevedore/Makefile +++ b/devel/py-stevedore/Makefile @@ -1,5 +1,5 @@ PORTNAME= stevedore -PORTVERSION= 4.1.1 +PORTVERSION= 5.0.0 CATEGORIES= devel MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -USES= python:3.6+ +USES= python:3.7+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-stevedore/distinfo b/devel/py-stevedore/distinfo index 171f5b28be98..4143abb1c0ed 100644 --- a/devel/py-stevedore/distinfo +++ b/devel/py-stevedore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668701939 -SHA256 (stevedore-4.1.1.tar.gz) = 7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a -SIZE (stevedore-4.1.1.tar.gz) = 514168 +TIMESTAMP = 1680530853 +SHA256 (stevedore-5.0.0.tar.gz) = 2c428d2338976279e8eb2196f7a94910960d9f7ba2f41f3988511e95ca447021 +SIZE (stevedore-5.0.0.tar.gz) = 513970 diff --git a/devel/py-stevedore/files/patch-stevedore___cache.py b/devel/py-stevedore/files/patch-stevedore___cache.py new file mode 100644 index 000000000000..06603464868e --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore___cache.py @@ -0,0 +1,25 @@ +--- stevedore/_cache.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/_cache.py +@@ -15,7 +15,6 @@ + import errno + import glob + import hashlib +-import importlib.metadata as importlib_metadata + import itertools + import json + import logging +@@ -24,6 +23,14 @@ import os.path + import struct + import sys + ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + log = logging.getLogger('stevedore._cache') + diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py b/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py new file mode 100644 index 000000000000..060dcc05a802 --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py @@ -0,0 +1,18 @@ +--- stevedore/tests/test_driver.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_driver.py +@@ -13,7 +13,14 @@ + """Tests for stevedore.extension + """ + +-import importlib.metadata as importlib_metadata ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import driver + from stevedore import exception diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py b/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py new file mode 100644 index 000000000000..8e0fe752efb9 --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py @@ -0,0 +1,21 @@ +--- stevedore/tests/test_extension.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_extension.py +@@ -13,9 +13,17 @@ + """Tests for stevedore.extension + """ + +-import importlib.metadata as importlib_metadata + import operator + from unittest import mock ++ ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import exception + from stevedore import extension diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py b/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py new file mode 100644 index 000000000000..6801a1325adf --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py @@ -0,0 +1,18 @@ +--- stevedore/tests/test_sphinxext.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_sphinxext.py +@@ -12,7 +12,14 @@ + """Tests for the sphinx extension + """ + +-import importlib.metadata as importlib_metadata ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import extension + from stevedore import sphinxext