Skip to content

Commit 339f396

Browse files
moredipmoredip
authored
Merge branch 'main' into fix-sqlalchemy-engine-from-config-monkeypatching
2 parents 2eef6f1 + b6541f0 commit 339f396

File tree

51 files changed

+3342
-220
lines changed

Some content is hidden

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

51 files changed

+3342
-220
lines changed

‎.github/workflows/core_contrib_test_0.yml

+1,934
Large diffs are not rendered by default.

‎.github/workflows/generate_workflows.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from pathlib import Path
22

33
from generate_workflows_lib import (
4+
generate_contrib_workflow,
45
generate_lint_workflow,
56
generate_misc_workflow,
67
generate_test_workflow,
@@ -12,3 +13,4 @@
1213
generate_test_workflow(tox_ini_path, workflows_directory_path, "ubuntu-latest")
1314
generate_lint_workflow(tox_ini_path, workflows_directory_path)
1415
generate_misc_workflow(tox_ini_path, workflows_directory_path)
16+
generate_contrib_workflow(workflows_directory_path)

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ def get_misc_job_datas(tox_envs: list) -> list:
170170

171171

172172
def _generate_workflow(
173-
job_datas: list, name: str, workflow_directory_path: Path
173+
job_datas: list, name: str, workflow_directory_path: Path, max_jobs=250
174174
):
175175
# Github seems to limit the amount of jobs in a workflow file, that is why
176176
# they are split in groups of 250 per workflow file.
177177
for file_number, job_datas in enumerate(
178178
[
179-
job_datas[index : index + 250]
180-
for index in range(0, len(job_datas), 250)
179+
job_datas[index : index + max_jobs]
180+
for index in range(0, len(job_datas), max_jobs)
181181
]
182182
):
183183
with open(
@@ -219,7 +219,7 @@ def generate_contrib_workflow(
219219
get_contrib_job_datas(
220220
get_tox_envs(Path(__file__).parent.joinpath("tox.ini"))
221221
),
222-
"contrib",
222+
"core_contrib_test",
223223
workflow_directory_path,
224224
)
225225

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/contrib.yml.j2 ‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/core_contrib_test.yml.j2

+11-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Contrib {{ file_number }}
4+
name: Core Contrib Test {{ file_number }}
55

66
on:
7-
push:
8-
branches-ignore:
9-
- 'release/*'
10-
pull_request:
11-
7+
workflow_call:
8+
inputs:
9+
CORE_REPO_SHA:
10+
required: true
11+
type: string
12+
CONTRIB_REPO_SHA:
13+
required: true
14+
type: string
1215
env:
13-
CORE_REPO_SHA: ${% raw %}{{ github.sha }}{% endraw %}
14-
CONTRIB_REPO_SHA: main
16+
CORE_REPO_SHA: ${% raw %}{{ inputs.CORE_REPO_SHA }}{% endraw %}
17+
CONTRIB_REPO_SHA: ${% raw %}{{ inputs.CONTRIB_REPO_SHA }}{% endraw %}
1518
PIP_EXISTS_ACTION: w
1619

1720
jobs:
@@ -27,12 +30,6 @@ jobs:
2730
repository: open-telemetry/opentelemetry-python-contrib
2831
ref: ${% raw %}{{ env.CONTRIB_REPO_SHA }}{% endraw %}
2932

30-
- name: Checkout core repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
31-
uses: actions/checkout@v4
32-
with:
33-
repository: open-telemetry/opentelemetry-python
34-
path: opentelemetry-python-core
35-
3633
- name: Set up Python 3.8
3734
uses: actions/setup-python@v5
3835
with:

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
run: git checkout ${% raw %}{{ github.event.pull_request.head.sha }}{% endraw %}
5252
{%- endif %}
5353

54-
- name: Set up Python 3.10
54+
- name: Set up Python 3.11
5555
uses: actions/setup-python@v5
5656
with:
57-
python-version: "3.10"
57+
python-version: "3.11"
5858

5959
- name: Install tox
6060
run: pip install tox

‎.github/workflows/lint_0.yml

+18
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,24 @@ jobs:
286286
- name: Run tests
287287
run: tox -e lint-instrumentation-boto
288288

289+
lint-instrumentation-click:
290+
name: instrumentation-click
291+
runs-on: ubuntu-latest
292+
steps:
293+
- name: Checkout repo @ SHA - ${{ github.sha }}
294+
uses: actions/checkout@v4
295+
296+
- name: Set up Python 3.12
297+
uses: actions/setup-python@v5
298+
with:
299+
python-version: "3.12"
300+
301+
- name: Install tox
302+
run: pip install tox
303+
304+
- name: Run tests
305+
run: tox -e lint-instrumentation-click
306+
289307
lint-instrumentation-elasticsearch:
290308
name: instrumentation-elasticsearch
291309
runs-on: ubuntu-latest

‎.github/workflows/misc_0.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
- name: Checkout repo @ SHA - ${{ github.sha }}
2424
uses: actions/checkout@v4
2525

26-
- name: Set up Python 3.10
26+
- name: Set up Python 3.11
2727
uses: actions/setup-python@v5
2828
with:
29-
python-version: "3.10"
29+
python-version: "3.11"
3030

3131
- name: Install tox
3232
run: pip install tox
@@ -41,10 +41,10 @@ jobs:
4141
- name: Checkout repo @ SHA - ${{ github.sha }}
4242
uses: actions/checkout@v4
4343

44-
- name: Set up Python 3.10
44+
- name: Set up Python 3.11
4545
uses: actions/setup-python@v5
4646
with:
47-
python-version: "3.10"
47+
python-version: "3.11"
4848

4949
- name: Install tox
5050
run: pip install tox
@@ -61,10 +61,10 @@ jobs:
6161
- name: Checkout repo @ SHA - ${{ github.sha }}
6262
uses: actions/checkout@v4
6363

64-
- name: Set up Python 3.10
64+
- name: Set up Python 3.11
6565
uses: actions/setup-python@v5
6666
with:
67-
python-version: "3.10"
67+
python-version: "3.11"
6868

6969
- name: Install tox
7070
run: pip install tox
@@ -79,10 +79,10 @@ jobs:
7979
- name: Checkout repo @ SHA - ${{ github.sha }}
8080
uses: actions/checkout@v4
8181

82-
- name: Set up Python 3.10
82+
- name: Set up Python 3.11
8383
uses: actions/setup-python@v5
8484
with:
85-
python-version: "3.10"
85+
python-version: "3.11"
8686

8787
- name: Install tox
8888
run: pip install tox
@@ -103,10 +103,10 @@ jobs:
103103
- name: Checkout repo @ SHA - ${{ github.sha }}
104104
uses: actions/checkout@v4
105105

106-
- name: Set up Python 3.10
106+
- name: Set up Python 3.11
107107
uses: actions/setup-python@v5
108108
with:
109-
python-version: "3.10"
109+
python-version: "3.11"
110110

111111
- name: Install tox
112112
run: pip install tox
@@ -124,10 +124,10 @@ jobs:
124124
- name: Checkout repo @ SHA - ${{ github.sha }}
125125
uses: actions/checkout@v4
126126

127-
- name: Set up Python 3.10
127+
- name: Set up Python 3.11
128128
uses: actions/setup-python@v5
129129
with:
130-
python-version: "3.10"
130+
python-version: "3.11"
131131

132132
- name: Install tox
133133
run: pip install tox
@@ -142,10 +142,10 @@ jobs:
142142
- name: Checkout repo @ SHA - ${{ github.sha }}
143143
uses: actions/checkout@v4
144144

145-
- name: Set up Python 3.10
145+
- name: Set up Python 3.11
146146
uses: actions/setup-python@v5
147147
with:
148-
python-version: "3.10"
148+
python-version: "3.11"
149149

150150
- name: Install tox
151151
run: pip install tox

0 commit comments

Comments
 (0)