Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/docker/protobuf/alpine-3.20
Browse files Browse the repository at this point in the history
  • Loading branch information
codeboten authored Oct 7, 2024
2 parents 8a76425 + 10a409a commit 00484f2
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 781 deletions.
20 changes: 9 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,21 @@ updates:
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "docker"
directory: "/protobuf"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/schemas"
directories:
- "**/*"
schedule:
interval: "weekly"

- package-ecosystem: "gomod"
directory: "/schemas"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/semantic-conventions"
directories:
- "**/*"
schedule:
interval: "weekly"

- package-ecosystem: "pip"
directory: "/semantic-conventions"
directories:
- "**/*"
schedule:
interval: "weekly"
9 changes: 9 additions & 0 deletions semantic-conventions/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ Please update the changelog as part of any significant pull request.

## Unreleased

- Update json-schema version, remove properties that are not used anymore.
([#344](https://github.com/open-telemetry/build-tools/pull/344))
- Remove json-schema and documentation, add link to new location.
([#345](https://github.com/open-telemetry/build-tools/pull/345))

## 0.25.0

- Added display_name as an allowed property on semconv attribute groups
([#316](https://github.com/open-telemetry/build-tools/pull/316))
- BREAKING: Remove unused semantic convention types: `UnitSemanticConvention`, `MetricGroupSemanticConvention` and `ScopeSemanticConvention`
([#309](https://github.com/open-telemetry/build-tools/pull/309))

Expand Down
10 changes: 5 additions & 5 deletions semantic-conventions/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
black==24.3.0
mypy==1.9.0
pytest==8.1.1
flake8==7.0.0
pylint==3.1.0
black==24.8.0
mypy==1.11.2
pytest==8.3.2
flake8==7.1.1
pylint==3.2.7
isort==5.13.2
Loading

0 comments on commit 00484f2

Please sign in to comment.