Merge branch 'main' into joseph/branding

Author: joseph-sentry

.github/workflows/build_assets.yml

@@ -9,6 +9,9 @@ on:
         default: false
         description: "Attach artifacts to a release"
 
+permissions:
+  contents: read
+
 jobs:
   build_assets:
     name: Build packages - ${{ matrix.os }}

.github/workflows/build_for_pypi.yml

@@ -9,6 +9,9 @@ on:
         default: false
         description: "Build for PyPi"
 
+permissions:
+  contents: read
+
 jobs:
   build_src_for_pypi:
     runs-on: ubuntu-latest

.github/workflows/ci-job.yml

@@ -11,6 +11,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -33,14 +36,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r codecov-cli/requirements.txt
-          python -m pip install -e codecov-cli
-          python -m pip install -e prevent-cli
+          python -m pip install uv
+          uv sync --project prevent-cli
 
       - name: Run command_dump
         run: |
-          python command_dump.py
+          make command_dump
 
       - name: Detect changes on commit
         run: |
@@ -63,7 +64,6 @@ jobs:
           python-version: "3.12"
 
       - name: Install CLI
-        # todo: update this to dogfood prevent cli, maybe try both?
         run: |
           pip install codecov-cli
 
@@ -94,27 +94,25 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r codecov-cli/requirements.txt
-          python -m pip install -e codecov-cli
-          python -m pip install -e prevent-cli
-          pip install -r codecov-cli/tests/requirements.txt
+          python -m pip install uv
+          uv sync --project codecov-cli
+          uv sync --project prevent-cli
 
       - name: Test with pytest
         run: |
           cd codecov-cli
-          pytest --cov --junitxml=${{matrix.os}}-${{matrix.python-version}}junit.xml
+          uv run pytest --cov --junitxml=${{matrix.os}}-${{matrix.python-version}}junit.xml
         env:
           CODECOV_ENV: test
 
       - name: Dogfooding codecov-cli
         if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'getsentry' }}
         run: |
-          codecovcli -v do-upload --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag codecovcli
-          codecovcli do-upload --report-type test_results --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag codecovcli
+          uv run --project codecov-cli codecovcli -v do-upload --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag codecovcli
+          uv run --project codecov-cli codecovcli do-upload --report-type test_results --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag codecovcli
 
       - name: Dogfooding sentry-prevent-cli
         if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'getsentry' }}
         run: |
-          sentry-prevent-cli -v do-upload --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag sentry-prevent-cli
-          sentry-prevent-cli do-upload --report-type test_results --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag sentry-prevent-cli
+          uv run --project prevent-cli sentry-prevent-cli -v do-upload --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag sentry-prevent-cli
+          uv run --project prevent-cli sentry-prevent-cli do-upload --report-type test_results --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}} --flag sentry-prevent-cli

.github/workflows/ci.yml

@@ -6,6 +6,9 @@ on:
       - main
     types: [closed]
 
+permissions:
+  contents: read
+
 jobs:
   create-release:
     if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') && github.repository_owner == 'getsentry' }}

.github/workflows/create_release.yml

@@ -7,6 +7,9 @@ on:
         description: 'Name of version  (ie 23.9.5)'
         required: true
 
+permissions:
+  contents: read
+
 jobs:
   create-release-pr:
     name: Create PR

.github/workflows/create_release_pr.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches: [main, master]
 
+permissions:
+  contents: read
+
 jobs:
   enforce-license-compliance:
     runs-on: ubuntu-latest

.github/workflows/enforce-license-compliance.yml

@@ -5,6 +5,9 @@ on:
     types:
       - created
 
+permissions:
+  contents: read
+
 jobs:
   build_for_pypi:
     permissions:

.github/workflows/release_flow.yml

@@ -23,6 +23,9 @@ lint:
 	make lint.install
 	make lint.run
 
+command_dump:
+	cd prevent-cli && uv run command_dump.py
+
 tag.release:
 ifeq ($(shell echo ${version} | egrep "${tag_regex}"),)
 	@echo "Version '${version}' is not a valid git tag.\nUsage: make tag.release version=v0.0.0"

Makefile

@@ -7,20 +7,17 @@ authors = [{ name = "Sentry", email = "oss@sentry.io" }]
 description = "Codecov Command Line Interface"
 dependencies = [
     "click==8.*",
-    "httpx==0.27.*",
     "ijson==3.*",
-    "pyyaml==6.*",
-    "regex",
+    "PyYAML==6.*",
     "responses==0.21.*",
-    "sentry-sdk>=2.20.0",
+    "sentry-sdk==2.*",
     "test-results-parser==0.5.4",
-    "wrapt>=1.17.2",
 ]
 license = { file = "LICENSE" }
 name = "codecov-cli"
 readme = "README.md"
 requires-python = ">= 3.9"
-version = "11.0.0"
+version = "10.4.0"
 
 [project.scripts]
 codecov = "codecov_cli.main:run"
@@ -32,12 +29,12 @@ env = ["CODECOV_ENV=test"]
 [tool.setuptools]
 packages = ["codecov_cli"]
 
-[tool.cibuildwheel]
-skip = ["pp*", "cp313-*"]
-test-command = "codecovcli --help"
-
-[tool.cibuildwheel.config-settings]
-pure-python = "true"
-
-[tool.cibuildwheel.environment]
-PIP_CONSTRAINT = "requirements.txt"
+[dependency-groups]
+dev = [
+    "pre-commit==3.*",
+    "pytest==7.*",
+    "pytest-asyncio==0.21.1",
+    "pytest-cov==4.*",
+    "pytest-env==1.*",
+    "pytest-mock==3.*",
+]