Merge pull request pallets-eco#2186 from ulgens/clean-travis

mrjoes · web-flow · commit bda01aac6dad · 2021-11-28T22:36:31.000-05:00
Clear Travis residues
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.rst b/README.rst
@@ -7,8 +7,9 @@ references to *git@github.com:flask-admin/flask-admin.git*.
 .. image:: https://d322cqt584bo4o.cloudfront.net/flask-admin/localized.svg
 	:target: https://crowdin.com/project/flask-admin
 
-.. image:: https://travis-ci.org/flask-admin/flask-admin.svg?branch=master
-	:target: https://travis-ci.org/flask-admin/flask-admin
+.. image:: https://github.com/flask-admin/flask-admin/actions/workflows/test.yaml/badge.svg
+	:target: https://github.com/flask-admin/flask-admin/actions/workflows/test.yaml
+
 
 Introduction
 ------------
diff --git a/doc/index.rst b/doc/index.rst
@@ -41,7 +41,7 @@ Support
 
 ****
 
-Python 2.7 and 3.3 or higher.
+Python 3.6 or higher.
 
 Indices And Tables
 ------------------
diff --git a/flask_admin/contrib/rediscli.py b/flask_admin/contrib/rediscli.py
@@ -36,12 +36,6 @@ class RedisCli(BaseView):
         To use it, simply pass `Redis` connection object to the constructor.
     """
 
-    shlex_check = True
-    """
-        shlex from stdlib does not work with unicode on 2.7.2 and lower.
-        If you want to suppress warning, set this attribute to False.
-    """
-
     remapped_commands = {
         'del': 'delete'
     }
@@ -81,13 +75,6 @@ def __init__(self, redis,
         self._inspect_commands()
         self._contribute_commands()
 
-        if self.shlex_check and VER < (2, 7, 3):
-            warnings.warn('Warning: rediscli uses shlex library and it does '
-                          'not work with unicode until Python 2.7.3. To '
-                          'remove this warning, upgrade to Python 2.7.3 or '
-                          'suppress it by setting shlex_check attribute '
-                          'to False.')
-
     def _inspect_commands(self):
         """
             Inspect connection object and extract command names.
@@ -136,10 +123,6 @@ def _parse_cmd(self, cmd):
             :param cmd:
                 Command to parse
         """
-        if VER < (2, 7, 3):
-            # shlex can't work with unicode until 2.7.3
-            return tuple(x.decode('utf-8') for x in shlex.split(cmd.encode('utf-8')))
-
         return tuple(shlex.split(cmd))
 
     def _error(self, msg):
diff --git a/setup.py b/setup.py
@@ -42,10 +42,6 @@ def grep(attrname):
     'wtforms'
 ]
 
-if sys.version_info[0:2] < (3, 4):
-    # required for python < 3.4
-    install_requires.append('enum34>=1.1.6')
-
 
 setup(
     name='Flask-Admin',
@@ -84,11 +80,11 @@ def grep(attrname):
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
     test_suite='flask_admin.tests'
 )
