Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename development requirement files #3874

Closed
wants to merge 2 commits into from
Closed

Rename development requirement files #3874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1809331
Rename development requirement files
ocelotl Apr 23, 2024
80c83d2
Fix references to requirements.txt files
ocelotl Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
.tox
~/.cache/pip
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini',
'dev-requirements.txt') }}-core
'dev-requirements') }}-core
- name: Run tox
run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=opentelemetry-sdk/tests/output.json
- name: Report on SDK benchmark results
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
.tox
~/.cache/pip
key: v4-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini',
'dev-requirements.txt') }}-core
'dev-requirements') }}-core
- name: Windows does not let git check out files with long names
if: ${{ matrix.os == 'windows-2019'}}
run: git config --system core.longpaths true
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v4-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt')
key: v4-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements')
}}-core
- name: run tox
run: tox -e ${{ matrix.tox-environment }}
Expand Down Expand Up @@ -207,6 +207,6 @@ jobs:
.tox
~/.cache/pip
key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os
}}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
}}-${{ hashFiles('tox.ini', 'dev-requirements') }}-contrib
- name: run tox
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ build:

python:
install:
- requirements: docs-requirements.txt
- requirements: docs-requirements
0 dev-requirements.txt → dev-requirements
View file
Open in desktop
File renamed without changes.
0 docs-requirements.txt → docs-requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/examples/fork-process-model/flask-gunicorn/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Installation
------------
.. code-block:: sh

pip install -rrequirements.txt
pip install -rrequirements

Run application
---------------
Expand Down
0 ...ess-model/flask-gunicorn/requirements.txt → ...process-model/flask-gunicorn/requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/examples/fork-process-model/flask-uwsgi/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Installation
------------
.. code-block:: sh

pip install -rrequirements.txt
pip install -rrequirements

Run application
---------------
Expand Down
0 ...rocess-model/flask-uwsgi/requirements.txt → ...rk-process-model/flask-uwsgi/requirements
View file
Open in desktop
File renamed without changes.
0 ...trics/prometheus-grafana/requirements.txt → ...s/metrics/prometheus-grafana/requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/examples/metrics/reader/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation

.. code-block:: sh

pip install -r requirements.txt
pip install -r requirements

Run the Example
---------------
Expand Down
0 .../examples/metrics/reader/requirements.txt → docs/examples/metrics/reader/requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/examples/metrics/views/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Installation

.. code-block:: sh

pip install -r requirements.txt
pip install -r requirements

Run the Example
---------------
Expand Down
0 docs/examples/metrics/views/requirements.txt → docs/examples/metrics/views/requirements
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/examples/opencensus-shim/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ Start Jaeger
Python Dependencies
*******************

Install the Python dependencies in :scm_raw_web:`requirements.txt <docs/examples/opencensus-shim/requirements.txt >`
Install the Python dependencies in :scm_raw_web:`requirements <docs/examples/opencensus-shim/requirements >`

.. code-block:: sh

pip install -r requirements.txt
pip install -r requirements


Alternatively, you can install the Python dependencies separately:
Expand Down
0 ...examples/opencensus-shim/requirements.txt → docs/examples/opencensus-shim/requirements
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/examples/opentracing/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ Make sure that the Redis server is running by executing this:
Python Dependencies
*******************

Install the Python dependencies in :scm_raw_web:`requirements.txt <docs/examples/opentracing/requirements.txt >`
Install the Python dependencies in :scm_raw_web:`requirements <docs/examples/opentracing/requirements >`

.. code-block:: sh

pip install -r requirements.txt
pip install -r requirements


Alternatively, you can install the Python dependencies separately:
Expand Down
0 docs/examples/opentracing/requirements.txt → docs/examples/opentracing/requirements
View file
Open in desktop
File renamed without changes.
0 docs/getting_started/tests/requirements.txt → docs/getting_started/tests/requirements
View file
Open in desktop
File renamed without changes.
0 ...exporter-opencensus/test-requirements.txt → ...try-exporter-opencensus/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...otlp-proto-common/test-requirements-0.txt → ...ter-otlp-proto-common/test-requirements-0
View file
Open in desktop
File renamed without changes.
0 ...otlp-proto-common/test-requirements-1.txt → ...ter-otlp-proto-common/test-requirements-1
View file
Open in desktop
File renamed without changes.
0 ...r-otlp-proto-grpc/test-requirements-0.txt → ...orter-otlp-proto-grpc/test-requirements-0
View file
Open in desktop
File renamed without changes.
0 ...r-otlp-proto-grpc/test-requirements-1.txt → ...orter-otlp-proto-grpc/test-requirements-1
View file
Open in desktop
File renamed without changes.
0 ...r-otlp-proto-http/test-requirements-0.txt → ...orter-otlp-proto-http/test-requirements-0
View file
Open in desktop
File renamed without changes.
0 ...r-otlp-proto-http/test-requirements-1.txt → ...orter-otlp-proto-http/test-requirements-1
View file
Open in desktop
File renamed without changes.
0 ...metry-exporter-otlp/test-requirements.txt → ...telemetry-exporter-otlp/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...exporter-prometheus/test-requirements.txt → ...try-exporter-prometheus/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...xporter-zipkin-json/test-requirements.txt → ...ry-exporter-zipkin-json/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...r-zipkin-proto-http/test-requirements.txt → ...orter-zipkin-proto-http/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...try-exporter-zipkin/test-requirements.txt → ...lemetry-exporter-zipkin/test-requirements
View file
Open in desktop
File renamed without changes.
0 gen-requirements.txt → gen-requirements
View file
Open in desktop
File renamed without changes.
0 opentelemetry-api/test-requirements.txt → opentelemetry-api/test-requirements
View file
Open in desktop
File renamed without changes.
0 opentelemetry-proto/test-requirements-0.txt → opentelemetry-proto/test-requirements-0
View file
Open in desktop
File renamed without changes.
0 opentelemetry-proto/test-requirements-1.txt → opentelemetry-proto/test-requirements-1
View file
Open in desktop
File renamed without changes.
0 opentelemetry-sdk/test-requirements.txt → opentelemetry-sdk/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...emantic-conventions/test-requirements.txt → ...ry-semantic-conventions/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...metry-propagator-b3/test-requirements.txt → ...telemetry-propagator-b3/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...y-propagator-jaeger/test-requirements.txt → ...metry-propagator-jaeger/test-requirements
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/eachdist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ def install_args(args):
"install",
"--upgrade",
"-r",
str(rootpath / "dev-requirements.txt"),
str(rootpath / "dev-requirements"),
]
+ args.pipargs,
check=True,
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_website_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
# this script generates the documentation required for
# opentelemetry.io

pip install -r docs-requirements.txt
pip install -r docs-requirements

TMP_DIR=/tmp/python_otel_docs
rm -Rf ${TMP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion scripts/proto_codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ echo "Creating temporary virtualenv at $venv_dir using $(python3 --version)"
python3 -m venv $venv_dir
source $venv_dir/bin/activate
python -m pip install \
-c $repo_root/gen-requirements.txt \
-c $repo_root/gen-requirements \
grpcio-tools mypy-protobuf
echo 'python -m grpc_tools.protoc --version'
python -m grpc_tools.protoc --version
Expand Down
0 ...try-opencensus-shim/test-requirements.txt → ...lemetry-opencensus-shim/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...ry-opentracing-shim/test-requirements.txt → ...emetry-opentracing-shim/test-requirements
View file
Open in desktop
File renamed without changes.
0 ...elemetry-test-utils/test-requirements.txt → ...pentelemetry-test-utils/test-requirements
View file
Open in desktop
File renamed without changes.
90 changes: 45 additions & 45 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ envlist =

[testenv]
deps =
-c dev-requirements.txt
-c dev-requirements
opentelemetry: pytest
opentelemetry: pytest-benchmark
opentelemetry: flaky
Expand All @@ -115,53 +115,53 @@ commands_pre =
; Install without -e to test the actual installation
py3{8,9,10,11}: python -m pip install -U pip setuptools wheel

api: pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt
sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt
semantic-conventions: pip install -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt
test-utils: pip install -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt
api: pip install -r {toxinidir}/opentelemetry-api/test-requirements
sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements
semantic-conventions: pip install -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements
test-utils: pip install -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements

; Install common packages for all the tests. These are not needed in all the
; cases but it saves a lot of boilerplate in this file.
opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/opentelemetry-test-utils

protobuf-0: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-0.txt
protobuf-1: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-1.txt
protobuf-0: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-0
protobuf-1: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-1

getting-started: pip install -r {toxinidir}/docs/getting_started/tests/requirements.txt
getting-started: pip install -r {toxinidir}/docs/getting_started/tests/requirements
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation-flask&subdirectory=instrumentation/opentelemetry-instrumentation-flask

exporter-opencensus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
exporter-opencensus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements

exporter-otlp-proto-common-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
exporter-otlp-proto-common-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
exporter-otlp-proto-common-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0
exporter-otlp-proto-common-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1

exporter-otlp-combined: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp/test-requirements.txt
exporter-otlp-combined: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp/test-requirements

opentelemetry-exporter-otlp-proto-grpc-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
opentelemetry-exporter-otlp-proto-grpc-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
opentelemetry-exporter-otlp-proto-grpc-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0
opentelemetry-exporter-otlp-proto-grpc-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1

opentelemetry-exporter-otlp-proto-http-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
opentelemetry-exporter-otlp-proto-http-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
opentelemetry-exporter-otlp-proto-http-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0
opentelemetry-exporter-otlp-proto-http-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1

opentracing-shim: pip install -r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements.txt
opentracing-shim: pip install -r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements

opencensus-shim: pip install -r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements.txt
opencensus-shim: pip install -r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements

exporter-prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
exporter-prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements

exporter-zipkin-combined: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
exporter-zipkin-combined: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements

exporter-zipkin-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
exporter-zipkin-proto-http: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements

exporter-zipkin-json: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
exporter-zipkin-json: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements

propagator-b3: pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt
propagator-b3: pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements

propagator-jaeger: pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
propagator-jaeger: pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements

; In order to get a healthy coverage report,
; we have to install packages in editable mode.
Expand Down Expand Up @@ -218,27 +218,27 @@ commands =
basepython: python3
recreate = True
deps =
-r dev-requirements.txt
-r dev-requirements

commands_pre =
pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt \
-r {toxinidir}/opentelemetry-sdk/test-requirements.txt \
-r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt \
-r {toxinidir}/opentelemetry-proto/test-requirements-0.txt \
-r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements.txt \
-r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt \
-r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp/test-requirements.txt \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements.txt \
-r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt \
-r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
pip install -r {toxinidir}/opentelemetry-api/test-requirements \
-r {toxinidir}/opentelemetry-sdk/test-requirements \
-r {toxinidir}/opentelemetry-semantic-conventions/test-requirements \
-r {toxinidir}/opentelemetry-proto/test-requirements-0 \
-r {toxinidir}/shim/opentelemetry-opentracing-shim/test-requirements \
-r {toxinidir}/shim/opentelemetry-opencensus-shim/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements \
-r {toxinidir}/tests/opentelemetry-test-utils/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0 \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0 \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0 \
-r {toxinidir}/exporter/opentelemetry-exporter-prometheus/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-otlp/test-requirements \
-r {toxinidir}/exporter/opentelemetry-exporter-zipkin/test-requirements \
-r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements \
-r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements

commands =
python scripts/eachdist.py lint --check-only
Expand All @@ -247,8 +247,8 @@ commands =
basepython: python3
recreate = True
deps =
-c {toxinidir}/dev-requirements.txt
-r {toxinidir}/docs-requirements.txt
-c {toxinidir}/dev-requirements
-r {toxinidir}/docs-requirements
changedir = docs
commands =
sphinx-build -E -a -W -b html -T . _build/html
Expand Down