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.

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

Build fixes and docs link #793

Merged
merged 4 commits into from
Aug 27, 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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Upgrade packaging tools
run: python -m pip install --upgrade pip setuptools virtualenv
run: python -m pip install --upgrade pip setuptools importlib_metadata virtualenv
- name: Install dependencies
run: python -m pip install --upgrade tox
- name: Run tox targets for ${{ matrix.python-version }}
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Upgrade packaging tools
run: python -m pip install --upgrade pip setuptools virtualenv
run: python -m pip install --upgrade pip setuptools importlib_metadata virtualenv
- name: Install dependencies
run: python -m pip install --upgrade tox
- name: Run tox targets for ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install packaging tools
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade pip setuptools importlib_metadata wheel

- name: Build Python pure Python wheel
env:
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ repos:
hooks:
- id: check-manifest
args: [--no-build-isolation]
additional_dependencies: [setuptools, wheel, setuptools-scm]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ To use Scout, you'll need to

For full installation instructions, including information on configuring Scout
via environment variables and troubleshooting, see our
[Python docs](https://docs.scoutapm.com/#python-agent).
[Python docs](https://scoutapm.com/docs/python).

## Support

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/django_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ def get_queryset(self, *args, **kwargs):
raise ValueError("BØØM!")

router = routers.SimpleRouter()
router.register(r"users", UserViewSet)
router.register(r"crash", ErrorViewSet)
router.register(r"users", UserViewSet, basename="user")
router.register(r"crash", ErrorViewSet, basename="error")

return router

Expand Down
Loading