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

infra: improve tox for local development #2999

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+355 −536
Open

infra: improve tox for local development #2999

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c1d49ba
move pip install from command to deps
emdneto Nov 13, 2024
0894499
add docker-test-requirements.txt
emdneto Nov 13, 2024
524b94a
fix celery and docs
emdneto Nov 13, 2024
3ebb547
fix
emdneto Nov 14, 2024
56073f1
fix tox.ini
emdneto Nov 14, 2024
82162d8
update docs
emdneto Nov 14, 2024
4ce4fbb
Merge branch 'main' into fix-tox-deps
lzchen Nov 14, 2024
ed57999
Merge branch 'main' into fix-tox-deps
emdneto Nov 19, 2024
66d56ac
Merge branch 'main' into fix-tox-deps
emdneto Nov 21, 2024
e6df0b6
Merge branch 'main' into fix-tox-deps
emdneto Nov 21, 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
1 change: 0 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pytest==7.4.4
pytest-cov==4.1.0
readme-renderer==42.0
bleach==4.1.0 # transient dependency for readme-renderer
protobuf~=3.13
markupsafe>=2.0.1
codespell==2.1.0
requests==2.32.3
Expand Down
2 changes: 1 addition & 1 deletion docs-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sphinx-rtd-theme==2.0.0rc4
sphinx-autodoc-typehints==1.25.2

# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
emdneto marked this conversation as resolved.
Show resolved Hide resolved
# doesn't work for pkg_resources.
# doesn't work for pkg_resources. Used by .readthedocs.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the pkg_resources hunk still relevant?

Copy link
Member Author

@emdneto emdneto Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the comment itself but, I'm pretty sure we still need install core packages to run in readthedocs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I meant just the comment 😅

-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
Expand Down
75 changes: 75 additions & 0 deletions tests/opentelemetry-docker-tests/tests/test-requirements.txt
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed this from tox.ini and created a requirement.txt file.
The cons are that it is more susceptible to dependabot alerts. Should we keep tox.ini, or is it okay to use a requirement.txt file for docker tests since there are a lot of dependencies?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok but we'll need to take care of dependabots :)

Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
aiopg==1.4.0
amqp==5.2.0
asgiref==3.8.1
async-timeout==4.0.3
asyncpg==0.29.0
attrs==23.2.0
bcrypt==4.1.2
billiard==4.2.0
celery==5.3.6
certifi==2024.2.2
cffi==1.16.0
chardet==3.0.4
click==8.1.7
click-didyoumean==0.3.0
click-plugins==1.1.1
click-repl==0.3.0
cryptography==42.0.5
Deprecated==1.2.14
distro==1.9.0
dnspython==2.6.1
docker==5.0.3
docker-compose==1.29.2
dockerpty==0.4.1
docopt==0.6.2
exceptiongroup==1.2.0
flaky==3.7.0
greenlet==3.0.3
grpcio==1.62.1
idna==2.10
iniconfig==2.0.0
jsonschema==3.2.0
kombu==5.3.5
mysql-connector-python==8.3.0
mysqlclient==2.1.1
opencensus-proto==0.1.0
packaging==24.0
paramiko==3.4.0
pluggy==1.4.0
prometheus_client==0.20.0
prompt-toolkit==3.0.43
protobuf==3.20.3
# prerequisite: install libpq-dev (debian) or postgresql-devel (rhel), postgresql (mac)
# see https://www.psycopg.org/docs/install.html#build-prerequisites
# you might have to install additional packages depending on your OS
psycopg==3.1.18
psycopg2==2.9.9
psycopg2-binary==2.9.9
pycparser==2.21
pymongo==4.6.3
PyMySQL==0.10.1
PyNaCl==1.5.0
# prerequisite: install unixodbc
pyodbc==5.0.1
pyrsistent==0.20.0
pytest==8.0.2
pytest-celery==0.0.0
python-dateutil==2.9.0.post0
python-dotenv==0.21.1
pytz==2024.1
PyYAML==5.3.1
redis==5.0.1
remoulade==3.2.0
requests==2.25.0
six==1.16.0
SQLAlchemy==1.4.52
texttable==1.7.0
tomli==2.0.1
typing_extensions==4.12.2
tzdata==2024.1
urllib3==1.26.19
vine==5.1.0
wcwidth==0.2.13
websocket-client==0.59.0
wrapt==1.16.0
zipp==3.18.0
Loading
Loading