Merge branch 'trunk' into blazar_support

Author: micafer

.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/actions/gh-action-pip-audit/test/pyproject/pyproject.toml

@@ -2,5 +2,5 @@
 
 [project]
 dependencies = [
-  "pyyaml==5.1"
+  "pyyaml==5.4.1"
 ]

.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,13 +32,14 @@ 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
 
@@ -74,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 != '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
 
@@ -85,7 +85,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -119,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.
@@ -133,7 +133,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -170,13 +170,90 @@ jobs:
         run: |
           tox -e black-check,isort-check,pyupgrade,checks,import-timings,lint,pylint,mypy
 
+  build_test_release_artifact:
+    name: Build and Test Release Artifact
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python_version: [3.9]
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+
+      - name: Use Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Cache Python Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-lint.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -r requirements-ci.txt
+          pip install "build==1.2.2"
+
+      - name: Build Release Artifact
+        run: |
+          pip list installed
+          python -m build -vv
+
+      - name: Set Environment
+        run: |
+          export PYTHONPATH=.
+          export VERSION=$(python -c "import libcloud ; print(libcloud.__version__)")
+          echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
+
+      - name: Verify Tarball Release Artifact
+        run: |
+          # Verify tarball file exists
+          export TARBALL_FILENAME="apache_libcloud-${VERSION}.tar.gz"
+
+          ls -la "dist/${TARBALL_FILENAME}"
+
+          cd dist/
+
+          # Unpack tarball and verify + run the tests
+          tar -xzvf "${TARBALL_FILENAME}"
+
+          cd "apache_libcloud-${VERSION}/" 
+          tox -c tox.ini -epy3.9
+
+      - name: Verify Wheel Release Artifact
+        run: |
+          # Verify wheel file exists
+          export WHEEL_FILENAME="apache_libcloud-${VERSION}-py3-none-any.whl"
+
+          ls -la "dist/${WHEEL_FILENAME}"
+
+          cd dist/
+
+          # Unpack wheel and verify + run tests
+          unzip "${WHEEL_FILENAME}" -d "wheel"
+          cd wheel
+
+          # Since wheel doesn't include those files, we need to manually copy them over from
+          # repo root so we can run the tests
+          cp ../../tox.ini .
+          cp ../../requirements-tests.txt .
+          cp ../../libcloud/test/secrets.py-dist libcloud/test/secrets.py-dist
+          tox -c tox.ini -epy3.9
+
   build_test_docker_image:
     name: Build and Verify Docker Image
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -200,7 +277,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -268,7 +345,7 @@ jobs:
 
     strategy:
       matrix:
-        python_version: [3.8]
+        python_version: [3.9]
 
     steps:
       - uses: actions/checkout@master
@@ -307,7 +384,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: |
@@ -51,11 +51,20 @@ jobs:
           ls -la dist | grep .tar.gz
           ls -la dist | grep .whl
 
-      - name: Store dev artifacts
+      - name: Store dev artifacts - .tar.gz
         uses: actions/upload-artifact@v4
         with:
-          name: libcloud-dev-artifacts
+          name: libcloud-dev-tarball
           retention-days: 60
+          compression-level: 0
           path: |
             dist/*.tar.gz
+
+      - name: Store dev artifacts - .whl
+        uses: actions/upload-artifact@v4
+        with:
+          name: libcloud-dev-wheel
+          retention-days: 60
+          compression-level: 0
+          path: |
             dist/*.whl

.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

.gitignore

@@ -15,6 +15,7 @@ coverage.xml
 .idea
 dist/*apache-libcloud*
 dist/*apache_libcloud*
+dist/wheel
 docs/apidocs/*
 _build/
 apache_libcloud.egg-info/

CHANGES.rst

@@ -7,6 +7,23 @@ Changes in Apache Libcloud 3.9.0
 Common
 ~~~~~~
 
+- Unused ``setup.py`` file has been removed. The project has switched
+  to ``pyproject.toml`` a while ago and unused file has been removed to
+  reduce potential confusion.
+  (#2024)
+  [Tomaz Muraus - @Kami]
+
+- 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
@@ -25,9 +42,24 @@ Common
   (#1940)
   [@munahaf on behalf of OpenRefactory and Open Source Security Foundation]
 
+- Update versions of build and packaging tools required to build the package.
+
+  Per report from Rui Chen (@chenrui333) ansible homebrew package which
+  depends on libcloud was failing to build with Libcloud 3.8.0.
+
+  Special thanks to Rui Chen for their assistance with troubleshooting the issue
+  and testing v3.9.0 release candidate.
+  (#2047)
+  [Tomaz Muraus - @Kami, Rui Chen - @chenrui333]
+
 Compute
 ~~~~~~~
 
+- [OpenStack] Add optional node port ID to attach the floating IP in OpenStack
+  ex_attach_floating_ip_to_node function.
+  (#2028)
+  [Miguel Caballer - @micafer]
+
 - [OpenStack] Add metadata fields ``os_distro`` and ``os_version`` provided
   by OpenStack Image API (if set) to the ``extra`` field of the OpenStack NodeImage.
   (#1982)
@@ -97,6 +129,10 @@ Compute
   (#1983)
   [@cdfmlr]
 
+- [Amazon S3] Add support for ``me-central-1`` region.
+  (#2030)
+  [@seifertdan]
+
 Storage
 ~~~~~~~
 
@@ -124,6 +160,11 @@ Other / Development
   (#1994)
   [Tomaz Muraus - @Kami]
 
+- Add a workaround so tests work with pytest >= 8.2. Also use latest version of
+  pytest for running tests.
+  (#2033)
+  [Steve Kowalik - @s-t-e-v-e-n-k]
+
 Changes in Apache Libcloud 3.8.0
 --------------------------------
 

MANIFEST.in

@@ -1,5 +1,10 @@
+# NOTE: We still need to use MANIFEST.in for backward compatibility with past
+# distributions since pyproject.toml + setuptools backend doesn't support
+# as flexible includes and excludes as we need.
 global-exclude *.py[cod]
 global-exclude .pytest_cache
+
+# Include common files at the repository root
 include LICENSE
 include NOTICE
 include example_*.py
@@ -23,3 +28,16 @@ prune docs/
 prune demos/
 prune integration/
 prune pylint_plugins/
+prune __pycache__
+
+# Recursively include all files under the fixture directories
+recursive-include libcloud/test/backup/fixtures *
+recursive-include libcloud/test/common/fixtures *
+recursive-include libcloud/test/compute/fixtures *
+recursive-include libcloud/test/container/fixtures *
+recursive-include libcloud/test/dns/fixtures *
+recursive-include libcloud/test/loadbalancer/fixtures *
+recursive-include libcloud/test/storage/fixtures *
+
+# Exclude __pycache__ directories
+prune **/__pycache__