Skip to content

Commit 98b8c18

Browse files
committed
tox
1 parent 751ce4e commit 98b8c18

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
{%- if job_data == "generate-workflows" %}
2424
if: |
2525
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
26-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
26+
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
2727
{%- endif %}
2828
{%- if job_data == "public-symbols-check" %}
2929
if: |
3030
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
31-
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
31+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
3232
{%- endif %}
3333
steps:
3434
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}

.github/workflows/misc_0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
if: |
9898
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
99-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
99+
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
100100
steps:
101101
- name: Checkout repo @ SHA - ${{ github.sha }}
102102
uses: actions/checkout@v4

tox.ini

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,17 +1009,16 @@ commands =
10091009

10101010
[testenv:docs]
10111011
deps =
1012+
# Install from CORE_REPO SHA first before docs-requirements.txt dependencies (which uses egg links from core and used for READTHEDOCS)
1013+
{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
1014+
{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
1015+
{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
1016+
{toxinidir}/opentelemetry-instrumentation
1017+
{toxinidir}/util/opentelemetry-util-http
10121018
-c {toxinidir}/dev-requirements.txt
10131019
-r {toxinidir}/docs-requirements.txt
10141020
pytest
10151021

1016-
commands_pre =
1017-
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
1018-
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
1019-
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
1020-
python -m pip install {toxinidir}/opentelemetry-instrumentation
1021-
python -m pip install {toxinidir}/util/opentelemetry-util-http
1022-
10231022
changedir = docs
10241023

10251024
commands =

0 commit comments

Comments
 (0)