Revert "Build: For Python 3.13 SQLObject requires unreleased FormEncode"

This reverts commit 4b9bd5e6f4581a8757bbc64043e82c757bcb114a.

diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt
index 8829f81a160b05f1365cb1b1ebd4719b450bc608..44cc4309d02362380151b7357db0d99755267772 100644 (file)
--- a/devscripts/requirements/requirements.txt
+++ b/devscripts/requirements/requirements.txt
@@ -1,4 +1,3 @@
 SQLObject>=2.2.1; python_version == '2.7'
 SQLObject>=2.2.1; python_version == '2.7'

-SQLObject>=3.0.0; python_version >= '3.4' and python_version <= '3.12'
-SQLObject @ git+https://github.com/sqlobject/sqlobject.git#egg=sqlobject ; python_version >= '3.13'
+SQLObject>=3.0.0; python_version >= '3.4'

 m_lib.defenc>=1.0
 m_lib.defenc>=1.0

diff --git a/setup.py b/setup.py
index 3c821f9545f9e64f9b9c3141ef716ed29bf8bc06..8e4f34298d3e440a5d072f6ad5045111755b01c2 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -77,10 +77,7 @@ setup(
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     install_requires=[
         'SQLObject>=2.2.1; python_version=="2.7"',
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     install_requires=[
         'SQLObject>=2.2.1; python_version=="2.7"',

-        'SQLObject>=3.0.0; python_version>="3.4" and python_version<="3.12"',
-        "SQLObject @ "
-        "git+https://github.com/sqlobject/sqlobject.git#egg=sqlobject"
-        " ; python_version >= '3.13'",
+        'SQLObject>=3.0.0; python_version>="3.4"',

         'm_lib.defenc>=1.0',
     ],
     extras_require={
         'm_lib.defenc>=1.0',
     ],
     extras_require={