Skip to content

Commit c91cf73

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib into support-async-openai-instrumentation
2 parents 031c667 + c28f7c9 commit c91cf73

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/package-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ jobs:
102102
- name: Publish to PyPI
103103
env:
104104
TWINE_USERNAME: '__token__'
105-
TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
105+
TWINE_PASSWORD: ${{ secrets.pypi_password }}
106106
run: |
107-
twine upload --repository testpypi --skip-existing --verbose dist/*
107+
twine upload --skip-existing --verbose dist/*
108108
109109
- name: Generate release notes
110110
env:

.github/workflows/release.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,13 @@ jobs:
8181
# rejected by pypi (e.g "3 - Beta"). This would cause a failure during the
8282
# middle of the package upload causing the action to fail, and certain packages
8383
# might have already been updated, this would be bad.
84-
# EDIT: 5/31/2024 - TestPypi now requires a verified email. Commenting out as a temporary measure
85-
# until we found TestPypi credentials.
86-
# - name: Publish to TestPyPI
87-
# env:
88-
# TWINE_USERNAME: '__token__'
89-
# TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
90-
# run: |
91-
# twine upload --repository testpypi --skip-existing --verbose dist/*
84+
85+
- name: Publish to TestPyPI
86+
env:
87+
TWINE_USERNAME: '__token__'
88+
TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
89+
run: |
90+
twine upload --repository testpypi --skip-existing --verbose dist/*
9291
9392
- name: Publish to PyPI
9493
env:

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ You can run `tox` with the following arguments:
6868
Python version
6969
* `tox -e spellcheck` to run a spellcheck on all the code
7070
* `tox -e lint-some-package` to run lint checks on `some-package`
71+
* `tox -e generate-workflows` to run creation of new CI workflows if tox environments have been updated
7172
* `tox -e ruff` to run ruff linter and formatter checks against the entire codebase
7273

7374
`ruff check` and `ruff format` are executed when `tox -e ruff` is run. We strongly recommend you to configure [pre-commit](https://pre-commit.com/) locally to run `ruff` automatically before each commit by installing it as git hooks. You just need to [install pre-commit](https://pre-commit.com/#install) in your environment:
@@ -297,6 +298,7 @@ When updating the minimum supported Python version remember to:
297298

298299
- Remove the version in `pyproject.toml` trove classifiers
299300
- Remove the version from `tox.ini`
301+
- Update github workflows accordingly with `tox -e generate-workflows`
300302
- Search for `sys.version_info` usage and remove code for unsupported versions
301303
- Bump `py-version` in `.pylintrc` for Python version dependent checks
302304

@@ -306,6 +308,6 @@ When adding support for a new Python release remember to:
306308

307309
- Add the version in `tox.ini`
308310
- Add the version in `pyproject.toml` trove classifiers
309-
- Update github workflows accordingly; lint and benchmarks use the latest supported version
311+
- Update github workflows accordingly with `tox -e generate-workflows`; lint and benchmarks use the latest supported version
310312
- Update `.pre-commit-config.yaml`
311313
- Update tox examples in the documentation

0 commit comments

Comments
 (0)