Skip to content

Commit 9093c6b

Browse files
committed
Merge remote-tracking branch 'origin/main' into network
2 parents b523301 + d5b8553 commit 9093c6b

File tree

75 files changed

+4028
-904
lines changed

Some content is hidden

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

75 files changed

+4028
-904
lines changed

.devcontainer/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM mcr.microsoft.com/devcontainers/python:1-3.11-bookworm
2+
3+
4+
RUN \
5+
apt update && apt install bash-completion -y && \
6+
pip install pre-commit && \
7+
curl -sSL https://install.python-poetry.org | POETRY_HOME=/home/vscode/.local python3 -
8+
9+
10+
RUN \
11+
echo >> /home/vscode/.bashrc && \
12+
# add completions to bashrc
13+
# see how ubuntu does it for reference:
14+
# https://git.launchpad.net/ubuntu/+source/base-files/tree/share/dot.bashrc
15+
# https://stackoverflow.com/a/68566555
16+
echo 'if [ -f /etc/bash_completion ] && ! shopt -oq posix; then' >> /home/vscode/.bashrc && \
17+
echo ' . /etc/bash_completion' >> /home/vscode/.bashrc && \
18+
echo 'fi' >> /home/vscode/.bashrc && \
19+
echo >> /home/vscode/.bashrc && \
20+
echo '. <(poetry completions)' >> /home/vscode/.bashrc
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
echo "Running post-create-command.sh"
22

3-
curl -sSL https://install.python-poetry.org | python3 -
4-
3+
pre-commit install
54
poetry install --all-extras

.devcontainer/devcontainer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
{
44
"name": "Python 3",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bookworm",
6+
"build": {
7+
// Path is relative to the devcontainer.json file.
8+
// We prebuild the image to get poetry into the image
9+
// This saves the user a bit of time, when re-opening containers
10+
"dockerfile": "Dockerfile"
11+
},
12+
713
"features": {
814
"ghcr.io/devcontainers/features/docker-in-docker:2": {
915
"version": "latest",

.github/.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "4.0.1"
2+
".": "4.3.1"
33
}

.github/release-please-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"release-type": "python",
3-
"bootstrap-sha": "dcb4f6842cbfe6e880a77b0d4aabb3f396c6dc19",
43
"packages": {
54
".": {
65
"package-name": "testcontainers"

.github/settings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ labels:
6363
- { name: '🐧 linux', color: '#3ED4D',, description: '' }
6464
- { name: '👀 requires attention', color: '#fef2c0', description: '' }
6565
- { name: '📖 documentation', color: '#d93f0b', description: '' }
66+
- { name: '📦 package: cassandra', color: '#0052CC', description: '' }
6667
- { name: '📦 package: clickhouse', color: '#0052CC', description: '' }
6768
- { name: '📦 package: compose', color: '#0052CC', description: '' }
6869
- { name: '📦 package: core', color: '#0052CC', description: '' }

.github/workflows/ci-community.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
track-modules:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Checkout contents
2020
uses: actions/checkout@v4
@@ -38,14 +38,14 @@ jobs:
3838
outputs:
3939
changed_modules: ${{ steps.compute-changes.outputs.computed_modules }}
4040
test:
41+
runs-on: ubuntu-22.04
4142
needs: [track-modules]
4243
if: ${{ needs.track-modules.outputs.changed_modules != '[]' }}
4344
strategy:
4445
fail-fast: false
4546
matrix:
46-
python-version: [ "3.11" ]
47+
python-version: ["3.9", "3.10", "3.11", "3.12"]
4748
module: ${{ fromJSON(needs.track-modules.outputs.changed_modules) }}
48-
runs-on: ubuntu-latest
4949
steps:
5050
- name: Checkout contents
5151
uses: actions/checkout@v4
@@ -57,3 +57,5 @@ jobs:
5757
run: poetry install -E ${{ matrix.module }}
5858
- name: Run tests
5959
run: make modules/${{ matrix.module }}/tests
60+
- name: Run doctests
61+
run: make modules/${{ matrix.module }}/doctests

.github/workflows/ci-core.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ on:
1010

1111
jobs:
1212
test:
13+
runs-on: ubuntu-22.04
1314
strategy:
1415
fail-fast: false
1516
matrix:
16-
os: [ ubuntu ]
1717
python-version: ["3.9", "3.10", "3.11", "3.12"]
18-
runs-on: ${{ matrix.os }}-latest
1918
steps:
2019
- uses: actions/checkout@v4
2120
- name: Set up Python
@@ -28,3 +27,5 @@ jobs:
2827
run: poetry build && poetry run twine check dist/*.tar.gz
2928
- name: Run tests
3029
run: make core/tests
30+
- name: Run doctests
31+
run: make core/doctests

.github/workflows/ci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
python:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Setup Env

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up Python

0 commit comments

Comments
 (0)