Skip to content

Commit a293fc2

Browse files
iurisilvioocelotl
authored andcommitted
Upgrade tox
1 parent d167ef7 commit a293fc2

8 files changed

+28
-28
lines changed

.github/workflows/instrumentations_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
with:
8282
python-version: ${{ env[matrix.python-version] }}
8383
- name: Install tox
84-
run: pip install tox==3.27.1 tox-factor
84+
run: pip install tox
8585
- name: Cache tox environment
8686
# Preserves .tox directory between runs for faster installs
8787
uses: actions/cache@v1

.github/workflows/instrumentations_1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
python-version: ${{ env[matrix.python-version] }}
4545
- name: Install tox
46-
run: pip install tox==3.27.1 tox-factor
46+
run: pip install tox
4747
- name: Cache tox environment
4848
# Preserves .tox directory between runs for faster installs
4949
uses: actions/cache@v1

.github/workflows/prepare-patch-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
python-version: 3.9
5656
- name: Install tox
57-
run: pip install tox==3.27.1
57+
run: pip install tox
5858
- name: run tox
5959
run: tox -e generate
6060

.github/workflows/prepare-release-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
with:
8282
python-version: 3.9
8383
- name: Install tox
84-
run: pip install tox==3.27.1
84+
run: pip install tox
8585
- name: run tox
8686
run: tox -e generate
8787

@@ -165,7 +165,7 @@ jobs:
165165
with:
166166
python-version: 3.9
167167
- name: Install tox
168-
run: pip install tox==3.27.1
168+
run: pip install tox
169169
- name: run tox
170170
run: tox -e generate
171171

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
python-version: "3.10"
2626
- name: Install tox
27-
run: pip install tox==3.27.1
27+
run: pip install tox
2828
- name: Install libsnappy-dev
2929
if: ${{ matrix.tox-environment == 'lint' }}
3030
run: sudo apt-get install -y libsnappy-dev

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ some aspects of development, including testing against multiple Python versions.
3232
To install `tox`, run:
3333

3434
```console
35-
$ pip install tox==3.27.1
35+
$ pip install tox
3636
```
3737

3838
You can run `tox` with the following arguments:
@@ -107,7 +107,7 @@ Run tests:
107107

108108
```sh
109109
# make sure you have all supported versions of Python installed
110-
$ pip install tox==3.27.1 # only first time.
110+
$ pip install tox # only first time.
111111
$ tox # execute in the root of the repository
112112
```
113113

@@ -177,7 +177,7 @@ For a deeper discussion, see: https://github.com/open-telemetry/opentelemetry-sp
177177
## Running Tests Locally
178178

179179
1. Go to your Contrib repo directory. `git clone [email protected]:open-telemetry/opentelemetry-python-contrib.git && cd opentelemetry-python-contrib`.
180-
2. Make sure you have `tox` installed. `pip install tox==3.27.1`.
180+
2. Make sure you have `tox` installed. `pip install tox`.
181181
3. Run `tox` without any arguments to run tests for all the packages. Read more about [tox](https://tox.readthedocs.io/en/latest/).
182182

183183
### Testing against a different Core repo branch/commit

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Emeritus Maintainers:
128128
1. Go to your Contrib repo directory. `cd ~/git/opentelemetry-python-contrib`.
129129
2. Create a virtual env in your Contrib repo directory. `python3 -m venv my_test_venv`.
130130
3. Activate your virtual env. `source my_test_venv/bin/activate`.
131-
4. Make sure you have `tox` installed. `pip install tox==3.27.1`.
131+
4. Make sure you have `tox` installed. `pip install tox`.
132132
5. Run tests for a package. (e.g. `tox -e test-instrumentation-flask`.)
133133

134134
### Thanks to all the people who already contributed!

tox.ini

+18-18
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ setenv =
296296
; override CORE_REPO_SHA via env variable when testing other branches/commits than main
297297
; i.e: CORE_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
298298
CORE_REPO_SHA={env:CORE_REPO_SHA:main}
299-
CORE_REPO="git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}"
299+
CORE_REPO=git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}
300300

301301
changedir =
302302
test-distro: opentelemetry-distro/tests
@@ -359,10 +359,10 @@ commands_pre =
359359
py3{8,9,10,11}: python -m pip install -U pip setuptools wheel
360360
; Install common packages for all the tests. These are not needed in all the
361361
; cases but it saves a lot of boilerplate in this file.
362-
test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
363-
test: pip install "opentelemetry-semantic-conventions[test] @ {env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
364-
test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
365-
test: pip install "opentelemetry-test-utils[test] @ {env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
362+
test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
363+
test: pip install opentelemetry-semantic-conventions[test]@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
364+
test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
365+
test: pip install opentelemetry-test-utils[test]@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
366366
test: pip install {toxinidir}/opentelemetry-instrumentation
367367

368368
distro: pip install {toxinidir}/opentelemetry-distro
@@ -488,9 +488,9 @@ deps =
488488
pytest
489489

490490
commands_pre =
491-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
492-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
493-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
491+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
492+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
493+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
494494
python -m pip install {toxinidir}/opentelemetry-instrumentation
495495
python -m pip install {toxinidir}/util/opentelemetry-util-http
496496

@@ -515,11 +515,11 @@ deps =
515515
-r dev-requirements.txt
516516

517517
commands_pre =
518-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
519-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
520-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
521-
python -m pip install "{env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
522-
python -m pip install -e {toxinidir}/util/opentelemetry-util-http
518+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
519+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
520+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
521+
python -m pip install {env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
522+
python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
523523
python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
524524
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
525525
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
@@ -610,10 +610,10 @@ changedir =
610610
tests/opentelemetry-docker-tests/tests
611611

612612
commands_pre =
613-
pip install "{env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api" \
614-
"{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions" \
615-
"{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk" \
616-
"{env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils" \
613+
pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api \
614+
{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions \
615+
{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk \
616+
{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils \
617617
-e {toxinidir}/opentelemetry-instrumentation \
618618
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \
619619
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery \
@@ -630,7 +630,7 @@ commands_pre =
630630
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg \
631631
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis \
632632
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade \
633-
"{env:CORE_REPO}#egg=opentelemetry-exporter-opencensus&subdirectory=exporter/opentelemetry-exporter-opencensus"
633+
{env:CORE_REPO}\#egg=opentelemetry-exporter-opencensus&subdirectory=exporter/opentelemetry-exporter-opencensus
634634
docker-compose up -d
635635
python check_availability.py
636636

0 commit comments

Comments
 (0)