Skip to content

Commit 5fcbcd6

Browse files
authored
Merge branch 'trunk' into equinix-metal-deprecate-facility
2 parents 92a86c2 + 1eec0cd commit 5fcbcd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+300
-252
lines changed

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ github:
4444
strict: true
4545
# contexts are the names of checks that must pass
4646
contexts:
47-
- "Unit Tests (Python 3.7)"
4847
- "Unit Tests (Python 3.8)"
4948
- "Unit Tests (Python 3.9)"
5049
- "Unit Tests (Python 3.10)"
5150
- "Unit Tests (Python 3.11)"
51+
- "Unit Tests (Python 3.12)"
5252
- "Run Various Lint and Other Checks (3.8)"
5353
- "Build and upload Documentation (3.8)"
5454
- "Dependency Review"

.github/workflows/depsreview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: 'Dependency Review'
25-
uses: actions/dependency-review-action@v3
25+
uses: actions/dependency-review-action@v4
2626
# TODO: We really want one check for direct prod dependencies where we
2727
# only allows ASF, MIT, BSD and nother one for testing / dev
2828
# dependencies where we also allow GPL, etc.

.github/workflows/install_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
fetch-depth: 1
4343

4444
- name: Use Python ${{ matrix.python_version }}
45-
uses: actions/setup-python@v4
45+
uses: actions/setup-python@v5
4646
with:
4747
python-version: ${{ matrix.python_version }}
4848

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fetch-depth: 1
4141

4242
- name: Use Python ${{ matrix.python_version }}
43-
uses: actions/setup-python@v4
43+
uses: actions/setup-python@v5
4444
with:
4545
python-version: ${{ matrix.python_version }}
4646

.github/workflows/main.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
python_version:
35-
- 3.7
3635
- 3.8
3736
- 3.9
3837
- "3.10"
3938
- "3.11"
40-
- "3.12-dev"
39+
- "3.12"
4140
# cryptography is not compatible with older PyPy versions
42-
#- "pypy-3.7"
4341
- "pypy-3.8"
4442
os:
4543
- ubuntu-latest
@@ -54,7 +52,7 @@ jobs:
5452

5553
- name: Use Python ${{ matrix.python_version }}
5654
if: ${{ matrix.python_version != 'pyjion' }}
57-
uses: actions/setup-python@v4
55+
uses: actions/setup-python@v5
5856
with:
5957
python-version: ${{ matrix.python_version }}
6058

@@ -65,7 +63,7 @@ jobs:
6563
6664
- name: Use Python 3.10 (pyjion)
6765
if: ${{ matrix.python_version == 'pyjion' }}
68-
uses: actions/setup-python@v4
66+
uses: actions/setup-python@v5
6967
with:
7068
python-version: "3.10"
7169

@@ -81,7 +79,7 @@ jobs:
8179
8280
- name: Setup Dotnet 6
8381
if: ${{ matrix.python_version == 'pyjion' }}
84-
uses: actions/setup-dotnet@v3.2.0
82+
uses: actions/setup-dotnet@v4.0.0
8583
with:
8684
dotnet-version: "6.0.100"
8785

@@ -126,7 +124,7 @@ jobs:
126124
fetch-depth: 1
127125

128126
- name: Use Python ${{ matrix.python_version }}
129-
uses: actions/setup-python@v4
127+
uses: actions/setup-python@v5
130128
with:
131129
python-version: ${{ matrix.python_version }}
132130

@@ -174,7 +172,7 @@ jobs:
174172
fetch-depth: 1
175173

176174
- name: Use Python ${{ matrix.python_version }}
177-
uses: actions/setup-python@v4
175+
uses: actions/setup-python@v5
178176
with:
179177
python-version: ${{ matrix.python_version }}
180178

@@ -246,7 +244,7 @@ jobs:
246244
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq gcc libvirt-dev
247245
248246
- name: Use Python ${{ matrix.python_version }}
249-
uses: actions/setup-python@v4
247+
uses: actions/setup-python@v5
250248
with:
251249
python-version: ${{ matrix.python_version }}
252250

@@ -309,7 +307,7 @@ jobs:
309307
fetch-depth: 1
310308

311309
- name: Use Python ${{ matrix.python_version }}
312-
uses: actions/setup-python@v4
310+
uses: actions/setup-python@v5
313311
with:
314312
python-version: ${{ matrix.python_version }}
315313

@@ -353,7 +351,7 @@ jobs:
353351
fetch-depth: 1
354352

355353
- name: Use Python ${{ matrix.python_version }}
356-
uses: actions/setup-python@v4
354+
uses: actions/setup-python@v5
357355
with:
358356
python-version: ${{ matrix.python_version }}
359357

.github/workflows/publish_dev_artifact.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fetch-depth: 1
3434

3535
- name: Use Python ${{ matrix.python_version }}
36-
uses: actions/setup-python@v4
36+
uses: actions/setup-python@v5
3737
with:
3838
python-version: 3.8
3939

@@ -52,7 +52,7 @@ jobs:
5252
ls -la dist | grep .whl
5353
5454
- name: Store dev artifacts
55-
uses: actions/upload-artifact@v3
55+
uses: actions/upload-artifact@v4
5656
with:
5757
name: libcloud-dev-artifacts
5858
retention-days: 60

.github/workflows/publish_pricing_to_s3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 1
3131

3232
- name: Use Python ${{ matrix.python_version }}
33-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3434
with:
3535
python-version: ${{ matrix.python_version }}
3636

CHANGES.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ Changes in Apache Libcloud in development
77
Common
88
~~~~~~
99

10+
- Support for Python 3.7 which is EOL has been removed.
11+
12+
If you still want to use Libcloud with Python 3.7, you should use an older
13+
release which still supports Python 3.7.
14+
(#1941)
15+
[Tomaz Muraus - @Kami]
16+
1017
- Types inheriting from ``libcloud.common.types.Type`` have been made hashable.
1118
This way they can be directly used for testing memberships in sets which
1219
contain string representation of the type enum value
@@ -21,6 +28,11 @@ Common
2128
Compute
2229
~~~~~~~
2330

31+
- [OpenStack] Add metadata fields ``os_distro`` and ``os_version`` provided
32+
by OpenStack Image API (if set) to the ``extra`` field of the OpenStack NodeImage.
33+
(#1982)
34+
[Miguel Caballer - @micafer]
35+
2436
- [LINODE] Add support for cloud-init metadata support to create_node()
2537
Add new functions ``create_key_pair``, ``list_key_pairs``, and ``get_image``
2638
(#1946)
@@ -56,6 +68,26 @@ Storage
5668
(#1950)
5769
[@H3199]
5870

71+
- [Amazon S3] Add support for ``eu-west-3`` region.
72+
(#1996)
73+
[Salih Kerem Dokuz - @keremdokuz]
74+
75+
Other / Development
76+
~~~~~--------------
77+
78+
- pytest library used for running tests and microbenchmarks has been upgraded to
79+
v8.1.
80+
81+
Changes in the pytest test discovery and collection mechanism and ordering
82+
have uncovered some race conditions and cross test pollution which has been
83+
addressed.
84+
85+
Now all the tests are passing, but it's possible that there are still some
86+
race conditions hiding which many only pop up in the future (since we run
87+
tests in parallel and order in which they run is not fully deterministic).
88+
(#1994)
89+
[Tomaz Muraus - @Kami]
90+
5991
Changes in Apache Libcloud 3.8.0
6092
--------------------------------
6193

README.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ through a unified and easy to use API.
5959
:Issues: https://issues.apache.org/jira/projects/LIBCLOUD/issues
6060
:Website: https://libcloud.apache.org/
6161
:Documentation: https://libcloud.readthedocs.io
62-
:Supported Python Versions: Python >= 3.7, PyPy >= 3.7, Python 3.10 + Pyjion
62+
:Supported Python Versions: Python >= 3.8, PyPy >= 3.8, Python 3.10 + Pyjion
6363
(Python 2.7 and Python 3.4 is supported by the
6464
v2.8.x release series, last version which supports
65-
Python 3.5 is v3.4.0 and v3.6.x for Python 3.6)
65+
Python 3.5 is v3.4.0, v3.6.x for Python 3.6, and
66+
v3.8.x for Python 3.7)
6667

6768
Resources you can manage with Libcloud are divided into the following categories:
6869

@@ -85,8 +86,10 @@ Documentation can be found at <https://libcloud.readthedocs.org>.
8586
Note on Python Version Compatibility
8687
====================================
8788

88-
Libcloud supports Python >= 3.7 and PyPy >= 3.7.
89+
Libcloud supports Python >= 3.8 and PyPy >= 3.8.
8990

91+
* Support for Python 3.7 has been dropped in v3.9.0 release.
92+
Last release series which supports Python 3.6 is v3.6.x.
9093
* Support for Python 3.6 has been dropped in v3.7.0 release.
9194
Last release series which supports Python 3.6 is v3.6.x.
9295
* Support for Python 3.5 has been dropped in v3.5.0 release.

contrib/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,15 @@ RUN set -e && \
2929
add-apt-repository ppa:pypy/ppa && \
3030
apt-get update && \
3131
apt-get -y install \
32-
python3.7 \
3332
python3.8 \
3433
python3.9 \
3534
python3.10 \
3635
python3.11 \
3736
python3-dev \
38-
python3.7-dev \
3937
python3.8-dev \
4038
python3.9-dev \
4139
python3.10-dev \
4240
python3.11-dev \
43-
python3.7-distutils \
4441
python3.8-distutils \
4542
python3.9-distutils \
4643
pypy3 \

0 commit comments

Comments
 (0)