From: Adolf Belka <adolf.belka@ipfire.org>
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 [thread overview]
Message-ID: <20210513164708.2889937-1-adolf.belka@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 10085 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# 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 <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# 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
--
2.31.1
next reply other threads:[~2021-05-13 16:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 16:47 Adolf Belka [this message]
2021-05-13 16:47 ` [PATCH 2/2] python3-dateutil: Removal of python3-six as a dependency Adolf Belka
2021-05-14 7:12 ` Peter Müller
2021-05-14 7:12 ` [PATCH 1/2] python-six: Removal of python2 & 3 addon versions of six Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210513164708.2889937-1-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox