Merge branch 'trunk' into patch-1

Author: Kami

.asf.yaml

@@ -44,13 +44,13 @@ github:
         strict: true
         # contexts are the names of checks that must pass
         contexts:
-          - "Unit Tests (Python 3.8)"
           - "Unit Tests (Python 3.9)"
           - "Unit Tests (Python 3.10)"
           - "Unit Tests (Python 3.11)"
           - "Unit Tests (Python 3.12)"
-          - "Run Various Lint and Other Checks (3.8)"
-          - "Build and upload Documentation (3.8)"
+          - "Unit Tests (Python 3.13)"
+          - "Run Various Lint and Other Checks (3.9)"
+          - "Build and upload Documentation (3.9)"
           - "Dependency Review"
 
 notifications:

.github/workflows/install_test.yml

@@ -28,6 +28,8 @@ jobs:
           - "3.10"
           - "3.11"
           - "pypy-3.7"
+          - "pypy-3.8"
+          - "pypy-3.9"
         include:
           # python 3.6 is not supported with ubuntu-latest anymore so we need to
           # use ubuntu 20.04

.github/workflows/integration-tests.yml

@@ -32,7 +32,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master

.github/workflows/main.yml

@@ -32,26 +32,23 @@ jobs:
       fail-fast: false
       matrix:
         python_version:
-          - 3.8
-          - 3.9
+          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
           # cryptography is not compatible with older PyPy versions
-          - "pypy-3.8"
+          - "pypy-3.9"
+          - "pypy-3.10"
         os:
           - ubuntu-latest
-        include:
-          - python_version: pyjion
-            os: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
 
       - name: Use Python ${{ matrix.python_version }}
-        if: ${{ matrix.python_version != 'pyjion' }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
@@ -61,28 +58,6 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq gcc libvirt-dev
 
-      - name: Use Python 3.10 (pyjion)
-        if: ${{ matrix.python_version == 'pyjion' }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      # From https://github.com/tonybaloney/Pyjion/blob/develop/main/.github/workflows/benchmark.yml#L26 (MIT)
-      - name: Install OS / deb dependencies
-        if: ${{ matrix.python_version == 'pyjion' }}
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq cmake llvm-9 clang-9 autoconf automake \
-          libtool build-essential python curl git lldb-6.0 liblldb-6.0-dev \
-          libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev \
-          libssl-dev libnuma-dev libkrb5-dev zlib1g-dev
-
-      - name: Setup Dotnet 6
-        if: ${{ matrix.python_version == 'pyjion' }}
-        uses: actions/[email protected]
-        with:
-          dotnet-version: "6.0.100"
-
       - name: Cache Python Dependencies
         uses: actions/cache@v4
         with:
@@ -91,11 +66,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - name: Install Pyjion
-        if: ${{ matrix.python_version == 'pyjion' }}
-        run: |
-          pip install pyjion
-
       - name: Install Python Dependencies
         run: |
           pip install -r requirements-ci.txt
@@ -105,8 +75,7 @@ jobs:
          tox -e py${{ matrix.python_version }}
 
       - name: Run dist install checks tox target
-        # NOTE: 3.12 will be failing until we migrate away from setup.py
-        if: ${{ matrix.python_version != 'pypy-3.7' && matrix.python_version != 'pypy-3.8' && matrix.python_version != 'pyjion' && matrix.python_version != '3.12-dev' }}
+        if: ${{ matrix.python_version != 'pypy-3.9' && matrix.python_version != 'pypy-3.10' }}
         run: |
          tox -e py${{ matrix.python_version }}-dist,py${{ matrix.python_version }}-dist-wheel
 
@@ -116,7 +85,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -150,7 +119,7 @@ jobs:
           tox -e coverage-ci
 
       - name: Upload Coverage to codecov.io
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           # We utilize secret for more realiable builds. Without secret being set, upload step
           # fails fairly often.
@@ -164,7 +133,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -207,7 +176,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -231,7 +200,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -299,7 +268,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -338,7 +307,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - name: Print Environment Info

.github/workflows/publish_dev_artifact.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Use Python ${{ matrix.python_version }}
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install Dependencies
         run: |

.github/workflows/publish_pricing_to_s3.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - name: Print Environment Info

CHANGES.rst

@@ -7,6 +7,17 @@ Changes in Apache Libcloud 3.9.0
 Common
 ~~~~~~
 
+- Indicate we also support Python 3.12 (non beta) and Python 3.13.
+  (#2050)
+  [Tomaz Muraus - @Kami]
+
+- Support for Python 3.8 which is EOL has been removed.
+
+  If you still want to use Libcloud with Python 3.8, you should use an older
+  release which still supports Python 3.8.
+  (#2050)
+  [Tomaz Muraus - @Kami]
+
 - Support for Python 3.7 which is EOL has been removed.
 
   If you still want to use Libcloud with Python 3.7, you should use an older

README.rst

@@ -59,11 +59,11 @@ through a unified and easy to use API.
 :Issues:        https://issues.apache.org/jira/projects/LIBCLOUD/issues
 :Website:       https://libcloud.apache.org/
 :Documentation: https://libcloud.readthedocs.io
-:Supported Python Versions: Python >= 3.8, PyPy >= 3.8, Python 3.10 + Pyjion
+:Supported Python Versions: Python >= 3.9, PyPy >= 3.9, Python 3.10 + Pyjion
                             (Python 2.7 and Python 3.4 is supported by the
                             v2.8.x release series, last version which supports
                             Python 3.5 is v3.4.0, v3.6.x for Python 3.6, and
-                            v3.8.x for Python 3.7)
+                            v3.8.x for Python 3.7 and 3.8)
 
 Resources you can manage with Libcloud are divided into the following categories:
 
@@ -86,10 +86,10 @@ Documentation can be found at <https://libcloud.readthedocs.org>.
 Note on Python Version Compatibility
 ====================================
 
-Libcloud supports Python >= 3.8 and PyPy >= 3.8.
+Libcloud supports Python >= 3.9 and PyPy >= 3.9.
 
-* Support for Python 3.7 has been dropped in v3.9.0 release.
-  Last release series which supports Python 3.6 is v3.6.x.
+* Support for Python 3.7 and 3.8 has been dropped in v3.9.0 release.
+  Last release series which supports Python 3.7 and 3.8 is v3.8.x.
 * Support for Python 3.6 has been dropped in v3.7.0 release.
   Last release series which supports Python 3.6 is v3.6.x.
 * Support for Python 3.5 has been dropped in v3.5.0 release.

contrib/Dockerfile

@@ -29,29 +29,27 @@ RUN set -e && \
     add-apt-repository ppa:pypy/ppa && \
     apt-get update && \
     apt-get -y install \
-      python3.8 \
       python3.9 \
       python3.10 \
       python3.11 \
+      python3.12 \
+      python3.13 \
       python3-dev \
-      python3.8-dev \
       python3.9-dev \
       python3.10-dev \
       python3.11-dev \
-      python3.8-distutils \
-      python3.9-distutils \
+      python3.12-dev \
+      python3.13-dev \
+      # Uses 3.10
       pypy3 \
       pypy3-dev \
       python3-pip \
       python3-distutils \
+      python3.9-distutils \
       libvirt-dev \
       # Needed by libvirt driver
-      pkg-config \
-      # Needed by cryptography library for pypy
-      libssl-dev
+      pkg-config
 
-# Workaround for zipp import error issue - https://github.com/pypa/virtualenv/issues/1630
-RUN python3.8 -m pip install --upgrade pip
 
 COPY . /libcloud
 
@@ -60,6 +58,6 @@ RUN if [ ! -f "/libcloud/README.rst" ]; then echo "libcloud/README.rst file not
 WORKDIR /libcloud
 
 RUN set -e && \
-    python3.8 -m pip install --no-cache-dir -r requirements-ci.txt
+    python3.9 -m pip install --no-cache-dir -r requirements-ci.txt
 
-CMD ["tox", "-e", "lint,isort-check,black-check,bandit,py3.7,py3.8,py3.9,py3.10,py3.11,pypypy3.8"]
+CMD ["tox", "-e", "lint,isort-check,black-check,bandit,py3.9,py3.10,py3.11,py3.12,py3.13,pypypy3.10"]

contrib/generate_contributor_list.py

@@ -111,12 +111,14 @@ def convert_to_markdown(contributors_map, include_tickets=False):
     def compare(item1, item2):
         lastname1 = item1.split(" ")[-1].lower()
         lastname2 = item2.split(" ")[-1].lower()
+
         return (lastname1 > lastname2) - (lastname1 < lastname2)
 
     names = contributors_map.keys()
     names = sorted(names, cmp=compare)
 
     result = []
+
     for name in names:
         tickets = contributors_map[name]
 
@@ -125,6 +127,7 @@ def compare(item1, item2):
         for ticket in tickets:
             if "-" not in ticket:
                 # Invalid ticket number
+
                 continue
 
             number = ticket.split("-")[1]
@@ -133,6 +136,8 @@ def compare(item1, item2):
                 url = JIRA_URL % (number)
             elif ticket.startswith("GITHUB-") or ticket.startswith("GH-"):
                 url = GITHUB_URL % (number)
+            else:
+                url = None
 
             values = {"ticket": ticket, "url": url}
             tickets_string.append("[%(ticket)s](%(url)s)" % values)
@@ -147,6 +152,7 @@ def compare(item1, item2):
         result.append(line.strip())
 
     result = "\n".join(result)
+
     return result