From patchwork Thu May 13 16:47:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4267 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FgyHr1WF8z44RY for ; Thu, 13 May 2021 16:47:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FgyHq0wZrzs2; Thu, 13 May 2021 16:47:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FgyHp70crz2yDF; Thu, 13 May 2021 16:47:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FgyHn2Crsz2xNt for ; Thu, 13 May 2021 16:47:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FgyHm2xD0z9L; Thu, 13 May 2021 16:47:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1620924436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WB/s6Wsipn0RogQUKIiHfc56S6hA0Nt+ioWVlzG+Ri8=; b=N0rJfZWDC8bJ55ITq48hCYYWGdSUN+wI4LzEzCnXlQmko0GKvq56/CVEJOnh7SNDwmrOKM EEVUjQLdXQBMcRBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1620924436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WB/s6Wsipn0RogQUKIiHfc56S6hA0Nt+ioWVlzG+Ri8=; b=mH0J6zji+bVAmYXdwdd05LSWYJK/WKKrbNciEDk7REvauR9tQseOyGTqcwMhx7upVCqS0+ ROznafqP9UE9MemvGvU6Lc+sQpuAHTxdFa6lf0gKDbuCXBXI9C3taQ1noOnb6QJaLCbgBp dMCc/yP+BzjsUe98CJwhh6P6uxDMdNtOCM2gCDV8mSIOD0926kIbbBY9Puh3fzGhqs0Lpx XElXHoaADf15N0IwZcYXhsGIo+QhGVCcI1iDHXXuZ1Wd/+VO9GFL2wFZGsD58o6WEMRxhQ ISLt405PPIFzc+dgariLimu+U4tQb+krg43yUnfXO2Lb5KnUn8Raa8aITiFzXg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] python-six: Removal of python2 & 3 addon versions of six Date: Thu, 13 May 2021 18:47:07 +0200 Message-Id: <20210513164708.2889937-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - six is a python compatibility module to enable modules to run on both python2 and python3. The code from six has to be copied into any other module/project that is intending to use it. - With the planned removal of python2 then neither version of this compatibility module is needed. - Removal of the lfs and rootfiles. Although python-six is an addon its rootfile was installed into the common folder rather than the packages folder. - Removal of the python-six and python3-six entries in make.sh Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- config/rootfiles/common/python-six | 9 --- config/rootfiles/packages/python3-six | 6 -- lfs/python-six | 82 -------------------------- lfs/python3-six | 83 --------------------------- make.sh | 2 - 5 files changed, 182 deletions(-) delete mode 100644 config/rootfiles/common/python-six delete mode 100644 config/rootfiles/packages/python3-six delete mode 100644 lfs/python-six delete mode 100644 lfs/python3-six diff --git a/config/rootfiles/common/python-six b/config/rootfiles/common/python-six deleted file mode 100644 index 9520c38ae..000000000 --- a/config/rootfiles/common/python-six +++ /dev/null @@ -1,9 +0,0 @@ -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/PKG-INFO -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/SOURCES.txt -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/dependency_links.txt -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/not-zip-safe -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/top_level.txt -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.py -#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.pyc diff --git a/config/rootfiles/packages/python3-six b/config/rootfiles/packages/python3-six deleted file mode 100644 index 0801d36da..000000000 --- a/config/rootfiles/packages/python3-six +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info -#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/top_level.txt -usr/lib/python3.8/site-packages/six.py diff --git a/lfs/python-six b/lfs/python-six deleted file mode 100644 index 3383e6d0d..000000000 --- a/lfs/python-six +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.10.0 - -THISAPP = six-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-six -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python3-six b/lfs/python3-six deleted file mode 100644 index 9d467f273..000000000 --- a/lfs/python3-six +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.14.0 - -THISAPP = six-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-six -PAK_VER = 3 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 21674588a57e649d1a6d977ec3122140 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && python3 setup.py install --root=/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 25616cc4e..d3a96c6cd 100755 --- a/make.sh +++ b/make.sh @@ -1458,7 +1458,6 @@ buildipfire() { lfsmake2 igmpproxy lfsmake2 fbset lfsmake2 opus - lfsmake2 python-six lfsmake2 python-pyparsing lfsmake2 spice-protocol lfsmake2 spice @@ -1547,7 +1546,6 @@ buildipfire() { lfsmake2 python-distutils-extra lfsmake2 ddns lfsmake2 python3-setuptools-scm - lfsmake2 python3-six lfsmake2 python3-dateutil lfsmake2 python3-jmespath lfsmake2 python3-colorama From patchwork Thu May 13 16:47:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4268 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FgyHw3NPfz44RY for ; Thu, 13 May 2021 16:47:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FgyHw0sPVz4lr; Thu, 13 May 2021 16:47:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FgyHw0g4Fz2yXb; Thu, 13 May 2021 16:47:24 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FgyHt0XX4z2xNt for ; Thu, 13 May 2021 16:47:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FgyHs5rl9z9L; Thu, 13 May 2021 16:47:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1620924441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lEzbaLsbQ+ROCqseAMMku9jfMn1Gfa8J8s6AOZYZEW8=; b=Gl8vRxnb2PI3keouBFWlzUhwiBbRe+vnfXejK26IlrxpqkSGIUPdIIF5vlU+X+xG9pPdoZ vGfGRNyMq5TaaBBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1620924441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lEzbaLsbQ+ROCqseAMMku9jfMn1Gfa8J8s6AOZYZEW8=; b=MbDHcpACAD2k7R2aGdfztQ4N+lmP0UJuhYfLy66McaRxG5xpgujaHiHn9V4STTLMUDsXZh 4RdgHoG6ItKzLGvNotBmt6JT9qvfHf8yeAE8tCsrXOKm2rSMUiT4fuZMKfi8f4EMSSQMtm Y7VAlEUqmTiW3RhphNSSIvGMavBB4BikJ4LfIbLK9hmlaJhrEuV8vTdeRj3v6x0aN4qKlu Zzf+uuitq21HyTYAmd1YX+A17rYUgFYBHhzR/rg2pqtR3lpI7Dx17GKAEJgPHhh9PxVJJE 5a/eZ/3aC3m7KupxhaiamcwPFcSvEf0zT2Gc0W34wk45ZjA3+MjV/K7FuuUs6Q== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] python3-dateutil: Removal of python3-six as a dependency Date: Thu, 13 May 2021 18:47:08 +0200 Message-Id: <20210513164708.2889937-2-adolf.belka@ipfire.org> In-Reply-To: <20210513164708.2889937-1-adolf.belka@ipfire.org> References: <20210513164708.2889937-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - python3-dateutil is installed as a python3 module. - It had python3-six defined as a dependency. Python3-six is a module that allows a project to be capable of neing run under python2 or under python3 - With the planned removal of python2 there is no need to have python3-dateutil capable of working with python2. - python3-six addon is being removed as there is no need for any python3 module in IPFire to also be capable o0f running under python2 Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- lfs/python3-dateutil | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/python3-dateutil b/lfs/python3-dateutil index 1d70ac1c2..04bc39cf1 100644 --- a/lfs/python3-dateutil +++ b/lfs/python3-dateutil @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-dateutil -PAK_VER = 3 +PAK_VER = 4 -DEPS = python3-six +DEPS = ############################################################################### # Top-level Rules