Sync sqlparse package fork

.flake8

@@ -0,0 +1,8 @@
+[flake8]
+exclude =
+  tests,
+  docs,
+  dist
+max-complexity = 31
+statistics = True
+show-source = True

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/python-app.yml

@@ -15,36 +15,33 @@ on:
 jobs:
   test:
     name: Run tests on ${{ matrix.py }}
-    runs-on: ubuntu-20.04  # keep it on 20.04 to have Python 3.6 available
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         py:
+          - "3.13"
           - "3.12"
           - "3.11"
           - "3.10"
           - "3.9"
           - "3.8"
-          - "3.7"
-          - "3.6"
+          - "pypy-3.10"
           - "pypy-3.9"
-          - "pypy-3.8"
-          - "pypy-3.7"
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.py }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.py }}
         allow-prereleases: true
         check-latest: true
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip flit
-        flit install --deps=develop
+        python -m pip install --upgrade pip hatch
     - name: Lint with flake8
-      run: flake8 sqlparse --count --max-complexity=31 --show-source --statistics
-    - name: Test with pytest
-      run: pytest --cov=sqlparse
+      run: hatch run flake8
+    - name: Test with pytest and coverage
+      run: hatch run cov
     - name: Publish to codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4

.gitignore

@@ -1,22 +1,10 @@
-# PyCharm
-.idea/
-
 *.py[co]
 docs/build
 dist/
 build/
 MANIFEST
 .coverage
-.tox/
 .cache/
 *.egg-info/
 htmlcov/
-extras/appengine/sqlparse
-extras/appengine/lib/
-extras/py3k/sqlparse
-extras/py3k/tests
-extras/py3k/sqlparse.diff
-extras/py3k/tests.diff
-coverage.xml
-*.class
 .pytest_cache

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#     - requirements: docs/requirements.txt

AUTHORS

@@ -7,74 +7,81 @@ This module contains code (Python 2/3 compatibility) from the six
 project: https://bitbucket.org/gutworth/six.
 
 Alphabetical list of contributors:
-* Adam Greenhall <agreenhall@lyft.com>
-* Aki Ariga <chezou+github@gmail.com>
-* Alexander Beedie <ayembee@gmail.com>
-* Alexey Malyshev <nostrict@gmail.com>
-* ali-tny <aliteeney@googlemail.com>
-* andrew deryabin <github@djsf.com>
-* Andrew Tipton <andrew.tipton@compareglobalgroup.com>
-* atronah <atronah.ds@gmail.com>
-* casey <casey@cloudera.com>
-* Cauê Beloni <cbeloni@gmail.com>
-* Christian Clauss <cclauss@me.com>
-* circld <circld1@gmail.com>
-* Corey Zumar <corey.zumar@databricks.com>
-* Cristian Orellana <cristiano@groupon.com>
-* Dag Wieers <dag@wieers.com>
-* Daniel Harding <dharding@living180.net>
-* Darik Gamble <darik.gamble@gmail.com>
-* Demetrio92 <Demetrio.Rodriguez.T@gmail.com>
-* Dennis Taylor <dennis.taylor@clio.com>
-* Dvořák Václav <Vaclav.Dvorak@ysoft.com>
-* Erik Cederstrand <erik@adamatics.com>
-* Florian Bauer <florian.bauer@zmdi.com>
-* Fredy Wijaya <fredy.wijaya@gmail.com>
-* Gavin Wahl <gwahl@fusionbox.com>
-* Hugo van Kemenade <hugovk@users.noreply.github.com>
-* hurcy <cinyoung.hur@gmail.com>
-* Ian Robertson <ian.robertson@capitalone.com>
-* JacekPliszka <Jacek.Pliszka@gmail.com>
-* JavierPan <PeterSandwich@users.noreply.github.com>
-* Jean-Martin Archer <jm@jmartin.ca>
-* Jesús Leganés Combarro "Piranna" <piranna@gmail.com>
-* Johannes Hoff <johshoff@gmail.com>
-* John Bodley <john.bodley@airbnb.com>
-* Jon Dufresne <jon.dufresne@gmail.com>
-* Josh Soref <jsoref@users.noreply.github.com>
-* Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
-* koljonen <koljonen@outlook.com>
-* Likai Liu <liulk@likai.org>
-* Long Le Xich <codenamelxl@users.noreply.github.com>
-* mathilde.oustlant <mathilde.oustlant@ext.cdiscount.com>
-* Michael Schuller <chick@mschuller.net>
-* Mike Amy <cocoade@googlemail.com>
-* mulos <daniel.strackbein@gmail.com>
-* Oleg Broytman <phd@phdru.name>
-* osmnv <80402144+osmnv@users.noreply.github.com>
-* Patrick Schemitz <patrick.schemitz@digitalbriefkasten.de>
-* Pi Delport <pjdelport@gmail.com>
-* Prudhvi Vatala <pvatala@gmail.com>
-* quest <quest@wonky.windwards.net>
-* Robert Nix <com.github@rnix.org>
-* Rocky Meza <rmeza@fusionbox.com>
-* Romain Rigaux <romain.rigaux@gmail.com>
-* Rowan Seymour <rowanseymour@gmail.com>
-* Ryan Wooden <rygwdn@gmail.com>
-* saaj <id@saaj.me>
-* Shen Longxing <shenlongxing2012@gmail.com>
-* Simon Heisterkamp <she@delegate.dk>
-* Sjoerd Job Postmus
-* Soloman Weng <soloman1124@gmail.com>
-* spigwitmer <itgpmc@gmail.com>
-* Tao Wang <twang2218@gmail.com>
-* Tenghuan <tenghuanhe@gmail.com>
-* Tim Graham <timograham@gmail.com>
-* Victor Hahn <info@victor-hahn.de>
-* Victor Uriarte <vmuriart@gmail.com>
-* Ville Skyttä <ville.skytta@iki.fi>
-* vthriller <farreva232@yandex.ru>
-* wayne.wuw <wayne.wuw@alibaba-inc.com>
-* Will Jones <willjones127@gmail.com>
-* William Ivanski <william.ivanski@gmail.com>
-* Yago Riveiro <yago.riveiro@gmail.com>
+
+- Adam Greenhall <agreenhall@lyft.com>
+- Adam Johnson <me@adamj.eu>
+- Aki Ariga <chezou+github@gmail.com>
+- Alexander Beedie <ayembee@gmail.com>
+- Alexey Malyshev <nostrict@gmail.com>
+- ali-tny <aliteeney@googlemail.com>
+- andrew deryabin <github@djsf.com>
+- Andrew Tipton <andrew.tipton@compareglobalgroup.com>
+- atronah <atronah.ds@gmail.com>
+- casey <casey@cloudera.com>
+- Cauê Beloni <cbeloni@gmail.com>
+- Christian Clauss <cclauss@me.com>
+- circld <circld1@gmail.com>
+- Corey Zumar <corey.zumar@databricks.com>
+- Cristian Orellana <cristiano@groupon.com>
+- Dag Wieers <dag@wieers.com>
+- Daniel Harding <dharding@living180.net>
+- Darik Gamble <darik.gamble@gmail.com>
+- Demetrio92 <Demetrio.Rodriguez.T@gmail.com>
+- Dennis Taylor <dennis.taylor@clio.com>
+- Dvořák Václav <Vaclav.Dvorak@ysoft.com>
+- Erik Cederstrand <erik@adamatics.com>
+- Florian Bauer <florian.bauer@zmdi.com>
+- Fredy Wijaya <fredy.wijaya@gmail.com>
+- Gavin Wahl <gwahl@fusionbox.com>
+- Georg Traar <georg@crate.io>
+- griff <70294474+griffatrasgo@users.noreply.github.com>
+- Hugo van Kemenade <hugovk@users.noreply.github.com>
+- hurcy <cinyoung.hur@gmail.com>
+- Ian Robertson <ian.robertson@capitalone.com>
+- Igor Khrol <igor.khrol@automattic.com>
+- JacekPliszka <Jacek.Pliszka@gmail.com>
+- JavierPan <PeterSandwich@users.noreply.github.com>
+- Jean-Martin Archer <jm@jmartin.ca>
+- Jesús Leganés Combarro "Piranna" <piranna@gmail.com>
+- Johannes Hoff <johshoff@gmail.com>
+- John Bodley <john.bodley@airbnb.com>
+- Jon Dufresne <jon.dufresne@gmail.com>
+- Josh Soref <jsoref@users.noreply.github.com>
+- Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
+- koljonen <koljonen@outlook.com>
+- Likai Liu <liulk@likai.org>
+- Long Le Xich <codenamelxl@users.noreply.github.com>
+- mathilde.oustlant <mathilde.oustlant@ext.cdiscount.com>
+- Michael Schuller <chick@mschuller.net>
+- Mike Amy <cocoade@googlemail.com>
+- mulos <daniel.strackbein@gmail.com>
+- Oleg Broytman <phd@phdru.name>
+- osmnv <80402144+osmnv@users.noreply.github.com>
+- Patrick Schemitz <patrick.schemitz@digitalbriefkasten.de>
+- Pi Delport <pjdelport@gmail.com>
+- Prudhvi Vatala <pvatala@gmail.com>
+- quest <quest@wonky.windwards.net>
+- Robert Nix <com.github@rnix.org>
+- Rocky Meza <rmeza@fusionbox.com>
+- Romain Rigaux <romain.rigaux@gmail.com>
+- Rowan Seymour <rowanseymour@gmail.com>
+- Ryan Wooden <rygwdn@gmail.com>
+- saaj <id@saaj.me>
+- Shen Longxing <shenlongxing2012@gmail.com>
+- Simon Heisterkamp <she@delegate.dk>
+- Sjoerd Job Postmus
+- skryzh <sergeikryzh95@gmail.com>
+- Soloman Weng <soloman1124@gmail.com>
+- spigwitmer <itgpmc@gmail.com>
+- Tao Wang <twang2218@gmail.com>
+- Tenghuan <tenghuanhe@gmail.com>
+- Tim Graham <timograham@gmail.com>
+- Victor Hahn <info@victor-hahn.de>
+- Victor Uriarte <vmuriart@gmail.com>
+- Ville Skyttä <ville.skytta@iki.fi>
+- vthriller <farreva232@yandex.ru>
+- wayne.wuw <wayne.wuw@alibaba-inc.com>
+- Will Jones <willjones127@gmail.com>
+- William Ivanski <william.ivanski@gmail.com>
+- Yago Riveiro <yago.riveiro@gmail.com>
+- Zi-Xuan Fu <r33s3n6@gmail.com>