Merge lp:~cjwatson/storm/require-py38 into lp:storm

[Colin Watson]

Remove support for Python < 3.8.

I don't think anyone needs this any more, and it allows simplifying `tox.ini` a bit.

(I guess you might want to double-check with the Landscape folks. I think I remember that they were on at least focal now ...)

[Mitch Burton (mitchburton)]

Landscape is fine with dropping < 3.8. I'll let Launchpad weigh in for final review but consider this a +1 from me.

review: Approve

[Colin Watson (cjwatson)]

It just occurred to me that lp-signing uses Storm and is still deployed on bionic according to its Mojo spec, so Python 3.6. Maybe we should retain 3.6 support for now? That would still allow dropping the awkward `tox.ini` stuff for 3.5, and there's otherwise no apparent simplification to be gained by dropping 3.6 (other than speeding up the test suite).

Unmerged revisions

586. By Colin Watson on 2024-03-13

Remove support for Python < 3.8.

I don't think anyone needs this any more, and it allows simplifying
`tox.ini` a bit.

585. By Colin Watson on 2024-03-13

Run pyupgrade.

Generated using `find storm -name \*.py | xargs pyupgrade --py3-plus
--keep-percent-format`.

=== modified file 'NEWS'
--- NEWS	2024-03-04 16:33:02 +0000
+++ NEWS	2024-03-13 17:25:34 +0000
@@ -10,7 +10,7 @@
 API changes
 -----------
 
-- Remove support for Python 2.
+- Remove support for Python < 3.8 (including Python 2).
 - Remove the storm.compat module.
 - Deprecate storm.sqlobject.AutoUnicodeVariable and
   storm.sqlobject.AutoUnicode.

=== modified file 'setup.py'
--- setup.py	2024-03-04 16:33:02 +0000
+++ setup.py	2024-03-13 17:25:34 +0000
@@ -63,9 +63,6 @@
          "Lesser General Public License (LGPL)"),
         "Programming Language :: Python",
         "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 :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -81,7 +78,7 @@
     # warning) by distutils.
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.5",
+    python_requires=">=3.8",
     install_requires=["packaging >= 14.1"],
     test_suite="storm.tests.find_tests",
     tests_require=tests_require,

=== modified file 'storm/tests/schema/patch.py'
--- storm/tests/schema/patch.py	2024-03-13 17:25:34 +0000
+++ storm/tests/schema/patch.py	2024-03-13 17:25:34 +0000
@@ -352,10 +352,7 @@
             self.patch_applier.apply_all()
         except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
-            if sys.version_info >= (3, 3):
-                self.assertTrue("takes 0 positional arguments" in str(e))
-            else:
-                self.assertTrue("takes no arguments" in str(e))
+            self.assertTrue("takes 0 positional arguments" in str(e))
             self.assertTrue("TypeError" in str(e))
         else:
             self.fail("BadPatchError not raised")

=== modified file 'tox.ini'
--- tox.ini	2024-03-04 16:33:02 +0000
+++ tox.ini	2024-03-13 17:25:34 +0000
@@ -1,8 +1,5 @@
 [tox]
 envlist =
-    py35-{cextensions,nocextensions}
-    py36-{cextensions,nocextensions}
-    py37-{cextensions,nocextensions}
     py38-{cextensions,nocextensions}
     py39-{cextensions,nocextensions}
     py310-{cextensions,nocextensions}
@@ -11,8 +8,6 @@
     docs
 
 [testenv]
-download =
-    py35: true
 deps =
     .[test]
 passenv =
@@ -21,8 +16,6 @@
 setenv =
     cextensions: STORM_CEXTENSIONS = 1
     nocextensions: STORM_CEXTENSIONS = 0
-    py35: VIRTUALENV_DOWNLOAD = 1
-    py35: VIRTUALENV_PIP = 20.3.4
 commands =
     python dev/test {posargs}