We should tweak the commit message to say "the removed python version", as it doesn't exist anymore :)
Bruce On Mon, Nov 27, 2023 at 12:02 PM Jose Quaresma <[email protected]> wrote: > > Drop unused patches from the python version > > Signed-off-by: Jose Quaresma <[email protected]> > --- > ...0001-setup.py-import-fastentrypoints.patch | 28 --------- > ...-remove-maximum-version-requirements.patch | 57 ------------------- > 2 files changed, 85 deletions(-) > delete mode 100644 > recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch > delete mode 100644 > recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch > > diff --git > a/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch > > b/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch > deleted file mode 100644 > index df613e8..0000000 > --- > a/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From f3a22f0f14a4b3313e6405dfb6c97df949493a34 Mon Sep 17 00:00:00 2001 > -From: Ming Liu <[email protected]> > -Date: Thu, 30 Jan 2020 17:22:19 +0100 > -Subject: [PATCH] setup.py: import fastentrypoints > - > -Upstream-Status: Inappropriate [OE specific configuration] > - > -Signed-off-by: Ming Liu <[email protected]> > ---- > - setup.py | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/setup.py b/setup.py > -index ad57969..3cccffc 100644 > ---- a/setup.py > -+++ b/setup.py > -@@ -12,7 +12,7 @@ import sys > - import pkg_resources > - from setuptools import find_packages > - from setuptools import setup > -- > -+import fastentrypoints > - > - def read(*parts): > - path = os.path.join(os.path.dirname(__file__), *parts) > --- > -2.7.4 > - > diff --git > a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch > > b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch > deleted file mode 100644 > index 7205d3b..0000000 > --- > a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From e3aca6421e003d03d119e69bf3d6b30bb5c662c9 Mon Sep 17 00:00:00 2001 > -From: Chen Qi <[email protected]> > -Date: Fri, 22 Nov 2019 09:24:58 +0800 > -Subject: [PATCH] setup.py: remove maximum version requirements > - > -Remove maximum version requirements so that docker-compose will not > -require old version recipes. > - > -Upstream-Status: Inappropriate [OE Specific] > - > -Signed-off-by: Chen Qi <[email protected]> > -Signed-off-by: Ming Liu <[email protected]> > ---- > - setup.py | 24 ++++++++++++------------ > - 1 file changed, 12 insertions(+), 12 deletions(-) > - > -Index: docker-compose-1.29.1/setup.py > -=================================================================== > ---- docker-compose-1.29.1.orig/setup.py > -+++ docker-compose-1.29.1/setup.py > -@@ -25,16 +25,21 @@ > - > - > - install_requires = [ > -- 'docopt >= 0.6.1, < 1', > -- 'PyYAML >= 3.10, < 6', > -- 'requests >= 2.20.0, < 3', > -- 'texttable >= 0.9.0, < 2', > -+ 'docopt >= 0.6.1', > -+ 'PyYAML >= 3.10', > -+ 'requests >= 2.20.0', > -+ 'texttable >= 0.9.0', > - 'websocket-client >= 0.32.0, < 1', > - 'distro >= 1.5.0, < 2', > -- 'docker[ssh] >= 5', > -+ 'docker[ssh] >= 4.4.0, < 5', > - 'dockerpty >= 0.4.1, < 1', > - 'jsonschema >= 2.5.1, < 4', > -- 'python-dotenv >= 0.13.0, < 1', > -+ 'websocket-client >= 0.32.0', > -+ 'distro >= 1.5.0', > -+ 'docker[ssh] >= 5', > -+ 'dockerpty >= 0.4.1', > -+ 'jsonschema >= 2.5.1', > -+ 'python-dotenv >= 0.13.0', > - ] > - > - > -@@ -51,7 +56,7 @@ > - ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], > - ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'], > - ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], > -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], > -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], > - 'tests': tests_require, > - } > - > -- > 2.43.0 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8473): https://lists.yoctoproject.org/g/meta-virtualization/message/8473 Mute This Topic: https://lists.yoctoproject.org/mt/102833129/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
