Skip to content

Commit db4adc0

Browse files
blarghmateyblarghmatey
committed
chore: Resolve conflicts and add Wrapt 3 as upper bound
1 parent 424028d commit db4adc0

File tree

24 files changed

+2075
-1068
lines changed

24 files changed

+2075
-1068
lines changed

‎.github/workflows/test_0.yml‎

Lines changed: 154 additions & 914 deletions
Large diffs are not rendered by default.

‎.github/workflows/test_1.yml‎

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,139 @@ env:
3232

3333
jobs:
3434

35+
pypy3-test-instrumentation-falcon-4_ubuntu-latest:
36+
name: instrumentation-falcon-4 pypy-3.9 Ubuntu
37+
runs-on: ubuntu-latest
38+
timeout-minutes: 30
39+
steps:
40+
- name: Checkout repo @ SHA - ${{ github.sha }}
41+
uses: actions/checkout@v4
42+
43+
- name: Set up Python pypy-3.9
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: "pypy-3.9"
47+
48+
- name: Install tox
49+
run: pip install tox-uv
50+
51+
- name: Run tests
52+
run: tox -e pypy3-test-instrumentation-falcon-4 -- -ra
53+
54+
py39-test-instrumentation-fastapi_ubuntu-latest:
55+
name: instrumentation-fastapi 3.9 Ubuntu
56+
runs-on: ubuntu-latest
57+
timeout-minutes: 30
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.9
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.9"
66+
67+
- name: Install tox
68+
run: pip install tox-uv
69+
70+
- name: Run tests
71+
run: tox -e py39-test-instrumentation-fastapi -- -ra
72+
73+
py310-test-instrumentation-fastapi_ubuntu-latest:
74+
name: instrumentation-fastapi 3.10 Ubuntu
75+
runs-on: ubuntu-latest
76+
timeout-minutes: 30
77+
steps:
78+
- name: Checkout repo @ SHA - ${{ github.sha }}
79+
uses: actions/checkout@v4
80+
81+
- name: Set up Python 3.10
82+
uses: actions/setup-python@v5
83+
with:
84+
python-version: "3.10"
85+
86+
- name: Install tox
87+
run: pip install tox-uv
88+
89+
- name: Run tests
90+
run: tox -e py310-test-instrumentation-fastapi -- -ra
91+
92+
py311-test-instrumentation-fastapi_ubuntu-latest:
93+
name: instrumentation-fastapi 3.11 Ubuntu
94+
runs-on: ubuntu-latest
95+
timeout-minutes: 30
96+
steps:
97+
- name: Checkout repo @ SHA - ${{ github.sha }}
98+
uses: actions/checkout@v4
99+
100+
- name: Set up Python 3.11
101+
uses: actions/setup-python@v5
102+
with:
103+
python-version: "3.11"
104+
105+
- name: Install tox
106+
run: pip install tox-uv
107+
108+
- name: Run tests
109+
run: tox -e py311-test-instrumentation-fastapi -- -ra
110+
111+
py312-test-instrumentation-fastapi_ubuntu-latest:
112+
name: instrumentation-fastapi 3.12 Ubuntu
113+
runs-on: ubuntu-latest
114+
timeout-minutes: 30
115+
steps:
116+
- name: Checkout repo @ SHA - ${{ github.sha }}
117+
uses: actions/checkout@v4
118+
119+
- name: Set up Python 3.12
120+
uses: actions/setup-python@v5
121+
with:
122+
python-version: "3.12"
123+
124+
- name: Install tox
125+
run: pip install tox-uv
126+
127+
- name: Run tests
128+
run: tox -e py312-test-instrumentation-fastapi -- -ra
129+
130+
py313-test-instrumentation-fastapi_ubuntu-latest:
131+
name: instrumentation-fastapi 3.13 Ubuntu
132+
runs-on: ubuntu-latest
133+
timeout-minutes: 30
134+
steps:
135+
- name: Checkout repo @ SHA - ${{ github.sha }}
136+
uses: actions/checkout@v4
137+
138+
- name: Set up Python 3.13
139+
uses: actions/setup-python@v5
140+
with:
141+
python-version: "3.13"
142+
143+
- name: Install tox
144+
run: pip install tox-uv
145+
146+
- name: Run tests
147+
run: tox -e py313-test-instrumentation-fastapi -- -ra
148+
149+
py314-test-instrumentation-fastapi_ubuntu-latest:
150+
name: instrumentation-fastapi 3.14 Ubuntu
151+
runs-on: ubuntu-latest
152+
timeout-minutes: 30
153+
steps:
154+
- name: Checkout repo @ SHA - ${{ github.sha }}
155+
uses: actions/checkout@v4
156+
157+
- name: Set up Python 3.14
158+
uses: actions/setup-python@v5
159+
with:
160+
python-version: "3.14"
161+
162+
- name: Install tox
163+
run: pip install tox-uv
164+
165+
- name: Run tests
166+
run: tox -e py314-test-instrumentation-fastapi -- -ra
167+
35168
pypy3-test-instrumentation-fastapi_ubuntu-latest:
36169
name: instrumentation-fastapi pypy-3.9 Ubuntu
37170
runs-on: ubuntu-latest
@@ -4648,136 +4781,3 @@ jobs:
46484781

46494782
- name: Run tests
46504783
run: tox -e py313-test-instrumentation-sqlalchemy-2 -- -ra
4651-
4652-
py314-test-instrumentation-sqlalchemy-2_ubuntu-latest:
4653-
name: instrumentation-sqlalchemy-2 3.14 Ubuntu
4654-
runs-on: ubuntu-latest
4655-
timeout-minutes: 30
4656-
steps:
4657-
- name: Checkout repo @ SHA - ${{ github.sha }}
4658-
uses: actions/checkout@v4
4659-
4660-
- name: Set up Python 3.14
4661-
uses: actions/setup-python@v5
4662-
with:
4663-
python-version: "3.14"
4664-
4665-
- name: Install tox
4666-
run: pip install tox-uv
4667-
4668-
- name: Run tests
4669-
run: tox -e py314-test-instrumentation-sqlalchemy-2 -- -ra
4670-
4671-
py310-test-propagator-aws-xray-1_ubuntu-latest:
4672-
name: propagator-aws-xray-1 3.10 Ubuntu
4673-
runs-on: ubuntu-latest
4674-
timeout-minutes: 30
4675-
steps:
4676-
- name: Checkout repo @ SHA - ${{ github.sha }}
4677-
uses: actions/checkout@v4
4678-
4679-
- name: Set up Python 3.10
4680-
uses: actions/setup-python@v5
4681-
with:
4682-
python-version: "3.10"
4683-
4684-
- name: Install tox
4685-
run: pip install tox-uv
4686-
4687-
- name: Run tests
4688-
run: tox -e py310-test-propagator-aws-xray-1 -- -ra
4689-
4690-
py311-test-propagator-aws-xray-0_ubuntu-latest:
4691-
name: propagator-aws-xray-0 3.11 Ubuntu
4692-
runs-on: ubuntu-latest
4693-
timeout-minutes: 30
4694-
steps:
4695-
- name: Checkout repo @ SHA - ${{ github.sha }}
4696-
uses: actions/checkout@v4
4697-
4698-
- name: Set up Python 3.11
4699-
uses: actions/setup-python@v5
4700-
with:
4701-
python-version: "3.11"
4702-
4703-
- name: Install tox
4704-
run: pip install tox-uv
4705-
4706-
- name: Run tests
4707-
run: tox -e py311-test-propagator-aws-xray-0 -- -ra
4708-
4709-
py311-test-propagator-aws-xray-1_ubuntu-latest:
4710-
name: propagator-aws-xray-1 3.11 Ubuntu
4711-
runs-on: ubuntu-latest
4712-
timeout-minutes: 30
4713-
steps:
4714-
- name: Checkout repo @ SHA - ${{ github.sha }}
4715-
uses: actions/checkout@v4
4716-
4717-
- name: Set up Python 3.11
4718-
uses: actions/setup-python@v5
4719-
with:
4720-
python-version: "3.11"
4721-
4722-
- name: Install tox
4723-
run: pip install tox-uv
4724-
4725-
- name: Run tests
4726-
run: tox -e py311-test-propagator-aws-xray-1 -- -ra
4727-
4728-
py312-test-propagator-aws-xray-0_ubuntu-latest:
4729-
name: propagator-aws-xray-0 3.12 Ubuntu
4730-
runs-on: ubuntu-latest
4731-
timeout-minutes: 30
4732-
steps:
4733-
- name: Checkout repo @ SHA - ${{ github.sha }}
4734-
uses: actions/checkout@v4
4735-
4736-
- name: Set up Python 3.12
4737-
uses: actions/setup-python@v5
4738-
with:
4739-
python-version: "3.12"
4740-
4741-
- name: Install tox
4742-
run: pip install tox-uv
4743-
4744-
- name: Run tests
4745-
run: tox -e py312-test-propagator-aws-xray-0 -- -ra
4746-
4747-
py312-test-propagator-aws-xray-1_ubuntu-latest:
4748-
name: propagator-aws-xray-1 3.12 Ubuntu
4749-
runs-on: ubuntu-latest
4750-
timeout-minutes: 30
4751-
steps:
4752-
- name: Checkout repo @ SHA - ${{ github.sha }}
4753-
uses: actions/checkout@v4
4754-
4755-
- name: Set up Python 3.12
4756-
uses: actions/setup-python@v5
4757-
with:
4758-
python-version: "3.12"
4759-
4760-
- name: Install tox
4761-
run: pip install tox-uv
4762-
4763-
- name: Run tests
4764-
run: tox -e py312-test-propagator-aws-xray-1 -- -ra
4765-
4766-
py313-test-propagator-aws-xray-0_ubuntu-latest:
4767-
name: propagator-aws-xray-0 3.13 Ubuntu
4768-
runs-on: ubuntu-latest
4769-
timeout-minutes: 30
4770-
steps:
4771-
- name: Checkout repo @ SHA - ${{ github.sha }}
4772-
uses: actions/checkout@v4
4773-
4774-
- name: Set up Python 3.13
4775-
uses: actions/setup-python@v5
4776-
with:
4777-
python-version: "3.13"
4778-
4779-
- name: Install tox
4780-
run: pip install tox-uv
4781-
4782-
- name: Run tests
4783-
run: tox -e py313-test-propagator-aws-xray-0 -- -ra

0 commit comments

Comments
 (0)