From 896b3e8e0b7e256da84e05e1f534dc5c20321802 Mon Sep 17 00:00:00 2001 From: Quinn Milionis Date: Mon, 26 Aug 2024 16:54:16 -0700 Subject: [PATCH 1/4] fix pre-commit check-manifest missing dependencies --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9f4e2cb7..a62853d7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,3 +42,4 @@ repos: hooks: - id: check-manifest args: [--no-build-isolation] + additional_dependencies: [setuptools, wheel, setuptools-scm] From 2705f0ca91a3f8faa744a7f0dee3e317e9acf25a Mon Sep 17 00:00:00 2001 From: Quinn Milionis Date: Mon, 26 Aug 2024 16:54:32 -0700 Subject: [PATCH 2/4] update docs url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fcd87d0d..d4f0480d 100644 --- a/README.md +++ b/README.md @@ -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 From be81516507661f2e9fc9bb8020f1e4e7e6ca3cde Mon Sep 17 00:00:00 2001 From: Quinn Milionis Date: Mon, 26 Aug 2024 17:29:57 -0700 Subject: [PATCH 3/4] add missing setuptool dependency for github workflow --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1b0bb66..b1bd4b6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 }} @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 738fb77b..21ad6e6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: From 129f1105ec87b8f24aa2fd5b974a2656133baa7e Mon Sep 17 00:00:00 2001 From: Quinn Milionis Date: Mon, 26 Aug 2024 17:30:50 -0700 Subject: [PATCH 4/4] provide unique basemane for drf router viewsets --- tests/integration/django_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/django_app.py b/tests/integration/django_app.py index 7c27d3eb..4b68bf18 100644 --- a/tests/integration/django_app.py +++ b/tests/integration/django_app.py @@ -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