Skip to content

Commit ba9314e

Browse files
authored
Merge branch 'main' into protobuf5
2 parents 3e428f7 + 01a670e commit ba9314e

File tree

41 files changed

+74
-8
lines changed

Some content is hidden

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

41 files changed

+74
-8
lines changed

.github/workflows/misc_0.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,24 @@ jobs:
8888
- name: Run tests
8989
run: tox -e mypyinstalled
9090

91+
pyright:
92+
name: pyright
93+
runs-on: ubuntu-latest
94+
steps:
95+
- name: Checkout repo @ SHA - ${{ github.sha }}
96+
uses: actions/checkout@v4
97+
98+
- name: Set up Python 3.10
99+
uses: actions/setup-python@v5
100+
with:
101+
python-version: "3.10"
102+
103+
- name: Install tox
104+
run: pip install tox
105+
106+
- name: Run tests
107+
run: tox -e pyright
108+
91109
docs:
92110
name: docs
93111
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 2 additions & 0 deletions

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pylint==3.0.2
1+
pylint==3.2.1
22
flake8==6.1.0
33
isort==5.12.0
44
black==24.3.0

exporter/opentelemetry-exporter-otlp-proto-http/py.typed

Whitespace-only changes.

exporter/opentelemetry-exporter-otlp/py.typed

Whitespace-only changes.

exporter/opentelemetry-exporter-prometheus/py.typed

Whitespace-only changes.

exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ def collect(self) -> Iterable[PrometheusMetric]:
209209
)
210210

211211
if metric_family_id_metric_family:
212-
for metric_family in metric_family_id_metric_family.values():
213-
yield metric_family
212+
yield from metric_family_id_metric_family.values()
214213

215214
# pylint: disable=too-many-locals,too-many-branches
216215
def _translate_to_prometheus(

exporter/opentelemetry-exporter-zipkin-json/py.typed

Whitespace-only changes.

exporter/opentelemetry-exporter-zipkin-proto-http/py.typed

Whitespace-only changes.

0 commit comments

Comments
 (0)