Skip to content

Commit

Permalink
Merge pull request #162 from pypa/release-25.0
Browse files Browse the repository at this point in the history
Release 25.0
  • Loading branch information
di authored Mar 14, 2020
2 parents 7bf7529 + ac98d66 commit 8901b5a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.7
env: TOXENV=py37
dist: xenial
- python: 3.8
env: TOXENV=py38
dist: xenial
- python: pypy
env: TOXENV=pypy
- env: TOXENV=pep8
Expand Down
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
-----------------

Expand Down
2 changes: 1 addition & 1 deletion readme_renderer/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@
"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",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],

install_requires=[
"bleach>=2.1.0",
"docutils>=0.13.1",
"Pygments",
"Pygments>=2.5.1",
"six",
],

Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/test_CommonMark_008.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p>Here is some Python code for a <code>Dog</code>:</p>
<pre><span class="k">class</span> <span class="nc">Dog</span><span class="p">(</span><span class="n">Animal</span><span class="p">):</span>
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
<span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="n">name</span>

<span class="k">def</span> <span class="nf">make_sound</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/test_rst_008.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="n">name</span>

<span class="k">def</span> <span class="nf">make_sound</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="k">print</span><span class="p">(</span><span class="s1">'Ruff!'</span><span class="p">)</span>
<span class="nb">print</span><span class="p">(</span><span class="s1">'Ruff!'</span><span class="p">)</span>

<span class="n">dog</span> <span class="o">=</span> <span class="n">Dog</span><span class="p">(</span><span class="s1">'Fido'</span><span class="p">)</span>
</pre>
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,pypy,py34,py35,py36,py37,pep8,py2pep8,packaging,noextra
envlist = py27,pypy,py35,py36,py37,py38,pep8,py2pep8,packaging,noextra

[testenv]
deps =
Expand Down

0 comments on commit 8901b5a

Please sign in to comment.