Merge branch 'lxml-4.9'

.github/workflows/ci.yml

@@ -148,9 +148,21 @@ jobs:
 
       - name: Setup Python
         uses: actions/setup-python@v4
+        if: startsWith(matrix.python-version, '3.')
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Setup Python2 (Linux)
+        if: matrix.python-version == '2.7' && startsWith(matrix.os, 'ubuntu')
+        run: |
+            sudo ln -fs python2 /usr/bin/python
+            sudo apt-get update
+            sudo apt-get install python-setuptools python2-dev
+            curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+            sudo python2 get-pip.py
+            ls -l /usr/bin/pip* /usr/local/bin/pip*
+            which pip
+
       - name: Install MacOS dependencies
         if: startsWith(runner.os, 'mac')
         run: |
@@ -185,7 +197,7 @@ jobs:
 
       - name: Upload docs
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.extra_hash == '-docs' }}
+        if: matrix.extra_hash == '-docs'
         with:
           name: website_html
           path: doc/html
@@ -200,7 +212,7 @@ jobs:
 
       - name: Upload Wheel
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.env.STATIC_DEPS == 'true' }}
+        if: matrix.env.STATIC_DEPS == true  ||  matrix.env.STATIC_DEPS == 'true'
         with:
           name: wheels-${{ runner.os }}
           path: dist/*.whl

.github/workflows/wheels.yml

@@ -93,6 +93,8 @@ jobs:
             pyversion: "cp310*"
           - image: manylinux_2_24_aarch64
             pyversion: "cp311*"
+          - image: manylinux_2_24_aarch64
+            pyversion: "cp312*"
 
           - image: musllinux_1_1_aarch64
             pyversion: "cp36*"
@@ -106,6 +108,8 @@ jobs:
             pyversion: "cp310*"
           - image: musllinux_1_1_aarch64
             pyversion: "cp311*"
+          - image: musllinux_1_1_aarch64
+            pyversion: "cp312*"
 
     steps:
     - uses: actions/checkout@v3
@@ -153,7 +157,17 @@ jobs:
         os: [macos-latest, windows-2019]
         #os: [macos-10.15, windows-latest]
         #os: [macos-10.15]
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8-v7.3.7", "pypy-3.9-v7.3.9"]
+        python-version:
+          - "2.7"
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12-dev"
+          - "pypy-3.8-v7.3.7"
+          - "pypy-3.9-v7.3.9"
 
         #include:
         #  - os: windows-2016

CHANGES.txt

@@ -8,21 +8,11 @@ lxml changelog
 Bugs fixed
 ----------
 
-* ``lxml.objectify`` accepted non-decimal numbers like ``²²²`` as integers.
-
 * The internal exception handling in C callbacks was improved for Cython 3.0.
 
-* A memory leak in ``lxml.html.clean`` was resolved by switching to Cython 0.29.34+.
-
-* GH#348: URL checking in the HTML cleaner was improved.
-  Patch by Tim McCormack.
-
 * GH#370: A crash with recent libxml2 2.11.x versions was resolved.
   Patch by Michael Schlenker.
 
-* GH#371, GH#373: Some regex strings were changed to raw strings to fix Python warnings.
-  Patches by Jakub Wilk and Anthony Sottile.
-
 Other changes
 -------------
 
@@ -36,6 +26,31 @@ Other changes
 * Built with Cython 0.29.35 to adapt to changes in Python 3.11 and 3.12.
 
 
+4.9.3 (2023-07-04)
+==================
+
+Bugs fixed
+----------
+
+* ``lxml.objectify`` accepted non-decimal numbers like ``²²²`` as integers.
+
+* A memory leak in ``lxml.html.clean`` was resolved by switching to Cython 0.29.34+.
+
+* GH#348: URL checking in the HTML cleaner was improved.
+  Patch by Tim McCormack.
+
+* GH#371, GH#373: Some regex strings were changed to raw strings to fix Python warnings.
+  Patches by Jakub Wilk and Anthony Sottile.
+
+Other changes
+-------------
+
+* Wheels include zlib 1.2.13, libxml2 2.10.3 and libxslt 1.1.38
+  (zlib 1.2.12, libxml2 2.9.12+ and libxslt 1.1.34 on Windows).
+
+* Built with Cython 0.29.36 to adapt to changes in Python 3.12.
+
+
 4.9.2 (2022-12-13)
 ==================
 

doc/main.txt

@@ -160,8 +160,8 @@ Index <http://pypi.python.org/pypi/lxml/>`_ (PyPI).  It has the source
 that compiles on various platforms.  The source distribution is signed
 with `this key <pubkey.asc>`_.
 
-The latest version is `lxml 4.9.2`_, released 2022-12-13
-(`changes for 4.9.2`_).  `Older versions <#old-versions>`_
+The latest version is `lxml 4.9.3`_, released 2023-07-03
+(`changes for 4.9.3`_).  `Older versions <#old-versions>`_
 are listed below.
 
 Please take a look at the
@@ -256,7 +256,9 @@ See the websites of lxml
 ..
    and the `latest in-development version <https://lxml.de/dev/>`_.
 
-.. _`PDF documentation`: lxmldoc-4.9.2.pdf
+.. _`PDF documentation`: lxmldoc-4.9.3.pdf
+
+* `lxml 4.9.3`_, released 2023-06-30 (`changes for 4.9.3`_)
 
 * `lxml 4.9.2`_, released 2022-12-13 (`changes for 4.9.2`_)
 
@@ -284,6 +286,7 @@ See the websites of lxml
 
 * `older releases <https://lxml.de/4.6/#old-versions>`_
 
+.. _`lxml 4.9.3`: /files/lxml-4.9.3.tgz
 .. _`lxml 4.9.2`: /files/lxml-4.9.2.tgz
 .. _`lxml 4.9.1`: /files/lxml-4.9.1.tgz
 .. _`lxml 4.9.0`: /files/lxml-4.9.0.tgz

setup.py

@@ -263,6 +263,7 @@ def build_packages(files):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Programming Language :: C',
         'Operating System :: OS Independent',
         'Topic :: Text Processing :: Markup :: HTML',