CHECKSUMS.md5

@@ -120,3 +120,4 @@ e2e5c91996d68c248416c90127347233  ./slpkg-3.3.6.tar.gz
 976baf5c4b98ecae3d2336de801e8906  ./slpkg-3.4.0.tar.gz
 25c697d6039ddda6c0a79a0d28fe6145  ./slpkg-3.4.1.tar.gz
 14ba9c085dea13238e39fd476ed299c8  ./slpkg-3.4.2.tar.gz
+2f62cfc87b130310490ff0b76eb17b74  ./slpkg-3.4.3.tar.gz

ChangeLog.txt

+3.7.0 - 1/12/2019
+Updated:
+- Switch to python3
+
 3.4.3 - 19/05/2019
 Updated:
 - Update gen_repos_files.sh to version 1.94

INSTALL.md

@@ -3,7 +3,7 @@
 
 ##### Python & OS Support
 
-Slpkg works with Python versions 2.7.5+ .
+Slpkg works with Python versions 3.7+ .
 
 Slpkg works on Slackware distribution and possibly in some Slackware based
 distribution like SalixOS, Slackel etc.
@@ -22,4 +22,4 @@ There are mainly 3 ways:
 2. Download binary package from '`https://sourceforge.net/projects/slpkg/files/binary/`'
    and use Slackware command '`upgradepkg --install-new <slpkg binary>`'
 
-3. Using pip: '`pip install slpkg --upgrade`'
+3. Using pip: '`pip install https://gitlab.com/dslackw/slpkg/-/archive/3.7.0/slpkg-3.7.0.tar.gz`'

KNOWN_ISSUES

 Known issues:
-
-- Dialog utility crash in option --buildlist when move with arrows
-    sometimes without yet that create big issues.
-    Issues reference here: 
-    https://sourceforge.net/p/pythondialog/bugs/6/
-    
-    Upgrade dialog utility from here if only necessary: 
-    https://gitlab.com/dslackw/SlackBuilds/tree/master/dialog

bin/slpkg

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # slpkg file is part of slpkg.

clean.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # clean.py file is part of slpkg.

man/slpkg.8

@@ -68,7 +68,7 @@ Remove custom repository by name.
 .SS repo-enable, enable or disable repositories
 \fBslpkg\fP \fBrepo-enable\fP
 .PP
-Enable or disable repositories via dialog utility (require python2-pythondialog)
+Enable or disable repositories via dialog utility (require python3-pythondialog)
 
 .SS repo-list, repositories list
 \fBslpkg\fP \fBrepo-list\fP
@@ -268,7 +268,7 @@ build or install etc. Use "--checklist" additional option to load all repository
 .PP
 Additional options:
 .PP
-\fB--checklist\fP : Enable dialog utility and checklist option. (Require python2-pythondialog)
+\fB--checklist\fP : Enable dialog utility and checklist option. (Require python3-pythondialog)
 .PP
 \fB--case-ins\fP : Search package name in repository with case insensitive.
 
@@ -304,7 +304,7 @@ Additional options:
 .PP
 \fB--tag\fP : Remove packages with by TAG.
 .PP
-\fB--checklist\fP : Enable dialog utility and checklist option. (Require python2-pythondialog)
+\fB--checklist\fP : Enable dialog utility and checklist option. (Require python3-pythondialog)
 .PP
 \fB--third-party\fP : Remove all the third-party packages. (Be sure update the package lists before)
 

requirements.txt

 # Slackware Linux (based)
-# Python 2.7+
+# Python 3.7+
 # GNU wget
 # GNU coreutils
 #
@@ -9,4 +9,4 @@
 # httpie (alternative downloader)
 # pygraphviz >= 1.3.1 (drawing dependencies diagram)
 # perl 5 language and graph-easy >= 0.75 (drawing dependencies ascii diagram)
-# python2-pythondialog >= 3.3.0 (Python interface to the UNIX dialog utility)
+# python3-pythondialog >= 3.3.0 (Python interface to the UNIX dialog utility)

setup.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # setup.py file is part of slpkg.
@@ -38,7 +38,7 @@ INSTALLATION_REQUIREMENTS = []
 DOCS_REQUIREMENTS = []
 TESTS_REQUIREMENTS = []
 OPTIONAL_REQUIREMENTS = [
-    "python2-pythondialog >= 3.3.0",
+    "python3-pythondialog >= 3.3.0",
     "pygraphviz >= 1.3.1"
 ]
 
@@ -86,9 +86,7 @@ setup(
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: POSIX :: Linux",
         "Operating System :: Unix",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Unix Shell",
         "Topic :: Software Development :: Build Tools",
         "Topic :: System :: Archiving :: Packaging",

slackbuild/README

@@ -5,7 +5,7 @@ to install packages. Slpkg makes it easier to maintain groups
 of machines without having to manually update.
 
 Optional dependencies:
-   python2-pythondialog (for dialog box interface)
+   python3-pythondialog (for dialog box interface)
    pygraphviz (for drawing dependencies diagram)
    graph-easy (for drawing ascii dependencies diagram)
    aria2 (alternative downloader)

slackbuild/slpkg.SlackBuild

@@ -63,9 +63,6 @@ fi
 
 set -e
 
-PYTHON=python
-# [ "${PYTHON3:-no}" = "yes" ] && PYTHON=python3
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -83,14 +80,7 @@ find -L . \
 # skip pip installs
 sed -i 's/if "install"/if ""/' setup.py
 
-# Python 3 support temporarily is out until new Slackware version
-# will be release
-# if [ "$PYTHON3" = "yes" ]; then
-#  sh convert-py3k
-#  cd py3k/$PRGNAM
-#fi
-
-$PYTHON setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

slpkg/__metadata__.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # __metadata__.py file is part of slpkg.
@@ -78,7 +78,7 @@ class MetaData(object):
 
     __all__ = "slpkg"
     __author__ = "dslackw"
-    __version_info__ = (3, 4, 3)
+    __version_info__ = (3, 7, 0)
     __version__ = "{0}.{1}.{2}".format(*__version_info__)
     __license__ = "GNU General Public License v3 (GPLv3)"
     __email__ = "d.zlatanidis@gmail.com"

slpkg/arguments.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # arguments.py file is part of slpkg.

slpkg/auto_pkg.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # auto_pkg.py file is part of slpkg.
@@ -60,15 +60,15 @@ class Auto(object):
                 self.meta.color["ENDC"]))
         self.msg.template(78)
         try:
-            self.choice = raw_input(" > ")
+            self.choice = input(" > ")
         except EOFError:
             print("")
             raise SystemExit()
         if self.choice in self.commands.keys():
-            sys.stdout.write("   \x1b[1A{0}{1}{2}\n\n".format(
+            print("   \x1b[1A{0}{1}{2}\n\n".format(
                 self.meta.color["CYAN"], self.commands[self.choice],
-                self.meta.color["ENDC"]))
-            sys.stdout.flush()
+                self.meta.color["ENDC"]), end="")
+            print(end="", flush=True)
         self.execute()
 
     def execute(self):

slpkg/binary/check.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # check.py file is part of slpkg.
@@ -22,7 +22,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-from distutils.version import LooseVersion
+from pkg_resources import parse_version
 
 from slpkg.messages import Msg
 from slpkg.toolbar import status
@@ -54,7 +54,7 @@ def pkg_upgrade(repo, skip, flag):
             if name:    # this tips because some pkg_name is empty
                 repo_pkg = split_package(name[:-4])
             if (repo_pkg[0] == inst_pkg[0] and
-                LooseVersion(repo_pkg[1]) > LooseVersion(inst_pkg[1]) and
+                parse_version(repo_pkg[1]) > parse_version(inst_pkg[1]) and
                 repo_pkg[3] >= inst_pkg[3] and
                     inst_pkg[0] not in skip and
                     repo_pkg[1] != "blacklist"):

slpkg/binary/dependency.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # dependency.py file is part of slpkg.

slpkg/binary/greps.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # greps.py file is part of slpkg.

slpkg/binary/install.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # install.py file is part of slpkg.
@@ -23,7 +23,7 @@
 
 
 import os
-from distutils.version import LooseVersion
+from pkg_resources import parse_version
 
 from slpkg.utils import Utils
 from slpkg.sizes import units
@@ -192,7 +192,7 @@ class BinaryInstall(object):
             data_dict = Utils().case_sensitive(data)
             for pkg in self.packages:
                 index = self.packages.index(pkg)
-                for key, value in data_dict.iteritems():
+                for key, value in data_dict.items():
                     if key == pkg.lower():
                         self.packages[index] = value
 
@@ -247,7 +247,7 @@ class BinaryInstall(object):
         ins_ver = GetFromInstalled(name).version()[1:]
         if not ins_ver:
             ins_ver = "0"
-        if LooseVersion(rep_ver) < LooseVersion(ins_ver):
+        if parse_version(rep_ver) < parse_version(ins_ver):
             self.msg.template(78)
             print("| Package {0} don't downgrade, "
                   "setting by user".format(name))
@@ -308,7 +308,7 @@ class BinaryInstall(object):
                 " " * (18-len(pkg_repo[1])), pkg_repo[2],
                 " " * (8-len(pkg_repo[2])), pkg_repo[3],
                 " " * (7-len(pkg_repo[3])), repo,
-                comp, " K")).rstrip()
+                comp, " K").rstrip())
         return [pkg_sum, upg_sum, uni_sum]
 
     def top_view(self):

slpkg/binary/repo_init.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # repo_init.py file is part of slpkg.

slpkg/binary/search.py

-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # search.py file is part of slpkg.