Merge ~cjwatson/lazr.restful:drop-py2 into lazr.restful:main

Proposed by Colin Watson
Status: Merged
Merged at revision: 0cd284372fa57df10f5b79f89d98e4c8c456b8ff
Proposed branch: ~cjwatson/lazr.restful:drop-py2
Merge into: lazr.restful:main
Prerequisite: ~cjwatson/lazr.restful:rst-include
Diff against target: 44 lines (+2/-3)
3 files modified
NEWS.rst (+1/-0)
setup.py (+1/-2)
tox.ini (+0/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+413598@code.launchpad.net

Commit message

Drop Python 2 support

Description of the change

This just updates metadata. There's a lot of code to update or remove, but I'll do that separately, allowing pyupgrade to do the bulk of the work.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/NEWS.rst b/NEWS.rst
index 74ee44e..c9dff29 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -19,6 +19,7 @@ NEWS for lazr.restful
19 ``lazr.restful.testing.webservice.DummyRootResourceURL``19 ``lazr.restful.testing.webservice.DummyRootResourceURL``
20 => ``lazr.restful.testing.webservice.StubRootResourceURL``20 => ``lazr.restful.testing.webservice.StubRootResourceURL``
21- Apply black code formatter via pre-commit.21- Apply black code formatter via pre-commit.
22- Drop Python 2 support.
2223
231.1.0 (2021-10-07)241.1.0 (2021-10-07)
24==================25==================
diff --git a/setup.py b/setup.py
index 71f4fd8..7f0ed89 100755
--- a/setup.py
+++ b/setup.py
@@ -88,8 +88,6 @@ setup(
88 "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", # noqa: E50188 "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", # noqa: E501
89 "Operating System :: OS Independent",89 "Operating System :: OS Independent",
90 "Programming Language :: Python",90 "Programming Language :: Python",
91 "Programming Language :: Python :: 2",
92 "Programming Language :: Python :: 2.7",
93 "Programming Language :: Python :: 3",91 "Programming Language :: Python :: 3",
94 "Programming Language :: Python :: 3.5",92 "Programming Language :: Python :: 3.5",
95 "Programming Language :: Python :: 3.6",93 "Programming Language :: Python :: 3.6",
@@ -105,5 +103,6 @@ setup(
105 "lxml",103 "lxml",
106 ], # requiring this of normal users is too much104 ], # requiring this of normal users is too much
107 ),105 ),
106 python_requires=">=3.5",
108 test_suite="lazr.restful.tests",107 test_suite="lazr.restful.tests",
109)108)
diff --git a/tox.ini b/tox.ini
index 4030fe5..c191378 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
1[tox]1[tox]
2envlist =2envlist =
3 lint3 lint
4 py27
5 py354 py35
6 py365 py36
7 py376 py37

Subscribers

People subscribed via source and target branches