Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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 <jonc@chen.org.nz> [1]
- Loading branch information
Showing
6 changed files
with
87 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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') | ||
|
18 changes: 18 additions & 0 deletions
18
devel/py-stevedore/files/patch-stevedore_tests_test__driver.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
21 changes: 21 additions & 0 deletions
21
devel/py-stevedore/files/patch-stevedore_tests_test__extension.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
18 changes: 18 additions & 0 deletions
18
devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |