Skip to content

Commit 626ddd5

Browse files
authored
Merge branch 'main' into pr3995
2 parents a917d31 + f639606 commit 626ddd5

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- Running mypy on SDK resources
1111
([#4053](https://github.com/open-telemetry/opentelemetry-python/pull/4053))
12+
13+
- Added py.typed file to top-level module
14+
([#4084](https://github.com/open-telemetry/opentelemetry-python/pull/4084))
15+
1216
- Drop Final annotation from Enum in semantic conventions
1317
([#4085](https://github.com/open-telemetry/opentelemetry-python/pull/4085))
1418

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,3 +284,7 @@ When adding support for a new Python release remember to:
284284
- Update github workflows accordingly; lint and benchmarks use the latest supported version
285285
- Update `.pre-commit-config.yaml`
286286
- Update tox examples in the documentation
287+
288+
## Contributions that involve new packages
289+
290+
As part of an effort to mitigate namespace squatting on Pypi, please ensure to check whether a package name has been taken already on Pypi before contributing a new package. Contact a maintainer, bring the issue up in the weekly Python SIG or create a ticket in Pypi if a desired name has already been taken.

RELEASING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
https://readthedocs.org/projects/opentelemetry-python/builds/.
8989
If the build has not run automatically, it can be manually trigger via the readthedocs interface.
9090

91+
## Releasing dev version of new packages to claim namespace
92+
93+
When a contribution introduces a new package, in order to mitigate name-squatting incidents, release the current development version of the new package under the `opentelemetry` user to simply claim the namespace. This should be done shortly after the PR that introduced this package has been merged into `main`.
94+
9195
## Troubleshooting
9296

9397
### Publish failed

opentelemetry-api/src/opentelemetry/py.typed

Whitespace-only changes.

0 commit comments

Comments
 (0)