diff --git a/README.md b/README.md index 66f206c..2ce3fc0 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Redislite +[![CI/CD](https://img.shields.io/badge/CI/CD-Screwdriver-blue.svg)](https://screwdriver.cd/) [![Build Status](https://cd.screwdriver.cd/pipelines/2880/badge)](https://cd.screwdriver.cd/pipelines/2880) +[![Codestyle](https://img.shields.io/badge/code%20style-pep8-blue.svg)](https://www.python.org/dev/peps/pep-0008/) [![Coverage](https://codecov.io/gh/yahoo/redislite/branch/master/graph/badge.svg)](https://codecov.io/gh/yahoo/redislite) [![Current Version](https://img.shields.io/pypi/v/redislite.svg)](https://pypi.python.org/pypi/redislite/) -[![Supported Python](https://img.shields.io/badge/python-2.7,3.5,3.6,3.7,3.8,pypy-blue.svg)](https://pypi.python.org/pypi/redislite/) +[![Supported Python](https://img.shields.io/badge/python-3.6,3.7,3.8-blue.svg)](https://pypi.python.org/pypi/redislite/) [![License](https://img.shields.io/pypi/l/redislite.svg)](https://pypi.python.org/pypi/redislite/) [![Documentation](https://readthedocs.org/projects/redislite/badge/?version=latest)](http://redislite.readthedocs.org/en/latest/) @@ -21,7 +23,7 @@ It provides enhanced versions of the Redis-Py Python bindings for Redis. That p ## Requirements -The redislite module requires Python 2.7 or higher. +The redislite module requires Python 3.6 or higher. ### Installing requirements on Linux diff --git a/changelog.d/143.removal.md b/changelog.d/143.removal.md new file mode 100644 index 0000000..ee53ab2 --- /dev/null +++ b/changelog.d/143.removal.md @@ -0,0 +1 @@ +Drop support for Python versions (less than 3.6) that are now EOL. \ No newline at end of file diff --git a/changelog.d/README.md b/changelog.d/README.md new file mode 100644 index 0000000..af713a0 --- /dev/null +++ b/changelog.d/README.md @@ -0,0 +1,24 @@ +# Changelog Messages + +This directory contains changelog news fragment messages. + +Changelog messages are descriptions of changes for the end users of the package. In +contrast to change messages for developers which go into the git commit log. + +## Adding a new changelog message + +In the git branch that contains the change, create a file in this directory named in the following format: + + {issuenum}.{changetype}.md + +| | | +| ---------- | ---- | +| issuenum | Is the issue or change number for the change. This can be any valid string, and is frequently github issues or jira ticket number for the change. | +| changetype | Is the type of change, it can be one of the following: | +| | - feature - A new feature | +| | - bugfix - The change fixes a bug | +| | - doc - The change is an improvement to the documentation | +| | - removal - The changed involved removing code or features | +| | - misc - Other kinds of changes | + +The changes are automatically added to the changelog of the release that added the change document. diff --git a/redislite/client.py b/redislite/client.py index 4a6b792..98be2ca 100644 --- a/redislite/client.py +++ b/redislite/client.py @@ -424,7 +424,7 @@ def redis_log_tail(self, lines=1, width=80): with open(self.logfile) as log_handle: if lines == 0: - return [l.strip() for l in log_handle.readlines()] + return [_.strip() for _ in log_handle.readlines()] log_handle.seek(0, 2) log_size = log_handle.tell() if log_size == 0: @@ -436,8 +436,8 @@ def redis_log_tail(self, lines=1, width=80): log_handle.seek(seek_location, 0) data = log_handle.readlines() if len(data) >= lines: - return [l.strip() for l in data[-lines:]] - return [l.strip() for l in data] + return [_.strip() for _ in data[-lines:]] + return [_.strip() for _ in data] @property def redis_log(self): diff --git a/setup.cfg b/setup.cfg index f1570a3..b67905c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,15 +12,11 @@ classifiers = Operating System :: POSIX :: SunOS/Solaris Operating System :: POSIX Programming Language :: C - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: Implementation :: PyPy Programming Language :: Python Topic :: Software Development :: Libraries :: Python Modules Topic :: Software Development :: Libraries @@ -38,7 +34,7 @@ project_urls = Documentation = https://redislite.readthedocs.io/en/latest/ Source = https://github.com/yahoo/redislite url = https://github.com/yahoo/redislite -version = 5.0.6 +version = 6.0.0 [options] install_requires= @@ -47,7 +43,7 @@ install_requires= setuptools>38.0 packages= redislite -python_requires = >=2.7.11 +python_requires = >=3.6.0 [screwdrivercd.version] version_type = sdv4_SD_BUILD diff --git a/tox.ini b/tox.ini index 5a43dae..5aabf04 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skip_missing_interpreters=True -envlist = py27,py35,py36,py37,py38,pypy +envlist = py36,py37,py38 [testenv] deps=