From 97695d79e33583609288febff8001607fa2a19eb Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Sat, 14 Mar 2020 12:27:10 -0500 Subject: [PATCH 1/4] Require pygments>=2.5.2, fix tests --- setup.py | 2 +- tests/fixtures/test_CommonMark_008.html | 2 +- tests/fixtures/test_rst_008.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d090097..3dd40f7 100644 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ install_requires=[ "bleach>=2.1.0", "docutils>=0.13.1", - "Pygments", + "Pygments>=2.5.1", "six", ], diff --git a/tests/fixtures/test_CommonMark_008.html b/tests/fixtures/test_CommonMark_008.html index d063943..3126beb 100644 --- a/tests/fixtures/test_CommonMark_008.html +++ b/tests/fixtures/test_CommonMark_008.html @@ -1,6 +1,6 @@

Here is some Python code for a Dog:

class Dog(Animal):
-    def __init__(self, name):
+    def __init__(self, name):
         self.name = name
 
     def make_sound(self):
diff --git a/tests/fixtures/test_rst_008.html b/tests/fixtures/test_rst_008.html
index 77aaab1..81d2f48 100644
--- a/tests/fixtures/test_rst_008.html
+++ b/tests/fixtures/test_rst_008.html
@@ -4,7 +4,7 @@
         self.name = name
 
     def make_sound(self):
-        print('Ruff!')
+        print('Ruff!')
 
 dog = Dog('Fido')
From 8c1f80e2e124fe138e277563d140993c2e45dd10 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Sat, 14 Mar 2020 12:42:41 -0500 Subject: [PATCH 2/4] Drop support for Python 3.4 --- .travis.yml | 2 -- setup.py | 1 - tox.ini | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb22a9e..8511f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 diff --git a/setup.py b/setup.py index 3dd40f7..60a5e93 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,6 @@ "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", diff --git a/tox.ini b/tox.ini index 497e95f..77c491c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pypy,py34,py35,py36,py37,pep8,py2pep8,packaging,noextra +envlist = py27,pypy,py35,py36,py37,pep8,py2pep8,packaging,noextra [testenv] deps = From cd69f12a2f48c2d643d44bfbddbc1a61e2d2945b Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Sat, 14 Mar 2020 12:27:26 -0500 Subject: [PATCH 3/4] Support Python 3.8 --- .travis.yml | 3 +++ setup.py | 1 + tox.ini | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8511f03..dab63f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ matrix: - python: 3.7 env: TOXENV=py37 dist: xenial + - python: 3.8 + env: TOXENV=py38 + dist: xenial - python: pypy env: TOXENV=pypy - env: TOXENV=pep8 diff --git a/setup.py b/setup.py index 60a5e93..413aa0d 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ "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", ], diff --git a/tox.ini b/tox.ini index 77c491c..4717369 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pypy,py35,py36,py37,pep8,py2pep8,packaging,noextra +envlist = py27,pypy,py35,py36,py37,py38,pep8,py2pep8,packaging,noextra [testenv] deps = From ac98d662bdbd328fdbbc9a4088b7b4a32e2a5fee Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Sat, 14 Mar 2020 12:38:58 -0500 Subject: [PATCH 4/4] Release 25.0 --- CHANGES.rst | 8 ++++++++ readme_renderer/__about__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index acc07ab..dde6e77 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,14 @@ Changes ======= +25.0 (2020-03-14) +----------------- + +* Support Python 3.7 and 3.8 +* Drop support for Python 3.4 +* Require Pygments>=2.5.1 + + 24.0 (2018-10-27) ----------------- diff --git a/readme_renderer/__about__.py b/readme_renderer/__about__.py index 4903213..d4bd897 100644 --- a/readme_renderer/__about__.py +++ b/readme_renderer/__about__.py @@ -23,7 +23,7 @@ 'descriptions for Warehouse') __uri__ = "https://github.com/pypa/readme_renderer" -__version__ = "24.0" +__version__ = "25.0" __author__ = "The Python Packaging Authority" __email__ = "admin@mail.pypi.org"