Skip to content

Propper naming of requirements files #3191

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.

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

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This will make sure that your commits will have the correct coding style.
```bash
cd sentry-python

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

pip install pre-commit

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ lint: .venv

apidocs: .venv
@$(VENV_PATH)/bin/pip install --editable .
@$(VENV_PATH)/bin/pip install -U -r ./docs-requirements.txt
@$(VENV_PATH)/bin/pip install -U -r ./requirements-docs.txt
rm -rf docs/_build
@$(VENV_PATH)/bin/sphinx-build -vv -W -b html docs/ docs/_build
.PHONY: apidocs
Expand All @@ -61,6 +61,6 @@ apidocs-hotfix: apidocs
.PHONY: apidocs-hotfix

aws-lambda-layer: dist
$(VENV_PATH)/bin/pip install -r aws-lambda-layer-requirements.txt
$(VENV_PATH)/bin/pip install -r requirements-aws-lambda-layer.txt
$(VENV_PATH)/bin/python -m scripts.build_aws_lambda_layer
.PHONY: aws-lambda-layer
File renamed without changes.
4 changes: 2 additions & 2 deletions devenv-requirements.txt → requirements-devenv.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r linter-requirements.txt
-r test-requirements.txt
-r requirements-linting.txt
-r requirements-testing.txt
mockupdb # required by `pymongo` tests that are enabled by `pymongo` from linter requirements
pytest<7.0.0 # https://github.com/pytest-dev/pytest/issues/9621; see tox.ini
pytest-asyncio
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/build_aws_lambda_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def install_python_packages(self):
"pip",
"install",
"-r",
"aws-lambda-layer-requirements.txt",
"requirements-aws-lambda-layer.txt",
"--target",
self.python_site_packages,
],
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/aws_lambda/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def _install_dependencies(base_dir, subprocess_kwargs):
"pip",
"install",
"-r",
"aws-lambda-layer-requirements.txt",
"requirements-aws-lambda-layer.txt",
"--target",
base_dir,
],
Expand Down Expand Up @@ -68,7 +68,7 @@ def _install_dependencies(base_dir, subprocess_kwargs):
**subprocess_kwargs,
)
# Install the created Sentry SDK source distribution into the target directory
# Do not install the dependencies of the SDK, because they where installed by aws-lambda-layer-requirements.txt above
# Do not install the dependencies of the SDK, because they where installed by requirements-aws-lambda-layer.txt above
source_distribution_archive = glob.glob(
"{}/*.tar.gz".format(os.path.dirname(base_dir))
)[0]
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,12 @@ envlist =

[testenv]
deps =
# if you change test-requirements.txt and your change is not being reflected
# if you change requirements-testing.txt and your change is not being reflected
# in what's installed by tox (when running tox locally), try running tox
# with the -r flag
-r test-requirements.txt
-r requirements-testing.txt

linters: -r linter-requirements.txt
linters: -r requirements-linting.txt
linters: werkzeug<2.3.0

# === Common ===
Expand Down
Loading