Merge branch 'trunk' into ost_floating_port

Author: micafer

.github/workflows/main.yml

@@ -41,17 +41,13 @@ jobs:
           - "pypy-3.8"
         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 +57,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 +65,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
@@ -106,7 +75,7 @@ jobs:
 
       - 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.7' && matrix.python_version != 'pypy-3.8' && matrix.python_version != '3.12-dev' }}
         run: |
          tox -e py${{ matrix.python_version }}-dist,py${{ matrix.python_version }}-dist-wheel
 

pyproject.toml

@@ -86,7 +86,7 @@ test = [
 
 [tool.setuptools.packages.find]
 where = ["./"]
-include = ["libcloud", "libcloud.test*" ]
+include = ["libcloud", "libcloud.test*", "libcloud.*" ]
 
 [tool.setuptools.package-data]
 "*" = ["*.json", "*.xml", "*.pub", "*.key", "*.pem", "*.crt", "*.csv", "*.txt", "*.html"]

requirements-tests.txt

@@ -5,10 +5,11 @@ pytest==8.1.1
 pytest-xdist==3.5.0
 pytest-timeout==2.2.0
 pytest-benchmark[histogram]==4.0.0
-cryptography==42.0.5
+cryptography==44.0.0
 
 # NOTE: Only needed by nttcis loadbalancer driver
-pyopenssl==24.1.0
+# We need to use >= 25.0.0 to be compatible with cryptography >= 43
+pyopenssl==25.0.0
 
 # Required by subset of tests
 fasteners