ref: consolidate all dev requirements (#7352)

Author: joshuarli

.github/workflows/ci.yml

@@ -45,12 +45,12 @@ jobs:
         with:
           path: ~/.cache/pre-commit
           key: cache-epoch-1|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Setup pre-commit
-        run: make setup-git
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          make install-python-dependencies
+          python -m pip install -r requirements-test.txt
+      - name: Setup pre-commit
+        run: make setup-git
       - uses: getsentry/paths-filter@v2
         id: files
         with:
@@ -441,4 +441,4 @@ jobs:
     - uses: getsentry/action-validate-devservices-config@02a078d1280293e6598cabfbd318a01609c12c83
       name: Validate devservices config
       with:
-        requirements-file-path: requirements.txt
+        requirements-file-path: requirements-test.txt

Makefile

@@ -9,11 +9,11 @@ reset-python:
 	rm -rf .venv
 .PHONY: reset-python
 
-develop: install-python-dependencies install-brew-dev install-rs-dev setup-git
+develop: install-python-dependencies install-brew-dev install-rs-dev
+	make setup-git
 
 setup-git:
 	mkdir -p .git/hooks && cd .git/hooks && ln -sf ../../config/hooks/* ./
-	pip install 'pre-commit==3.6.0'
 	pre-commit install --install-hooks
 
 test:

docs/source/contributing/environment.rst

@@ -40,10 +40,7 @@ Clone this repo into your workspace::
 These commands set up the Python virtual environment::
 
     cd snuba
-    python -m venv .venv
-    source .venv/bin/activate
-    pip install --upgrade pip==22.2.2
-    make develop
+    devenv sync
 
 This command starts the Snuba api, which is capable of processing queries::
 
@@ -59,7 +56,7 @@ Running tests
 
 This command runs unit and integration tests::
 
-    make develop (if you have not run it already)
+    devenv sync (if you have not run it already)
     make test
 
 Running sentry tests against snuba

requirements-test.txt

@@ -1,5 +1,15 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
+pre-commit==3.6.0
+
+black==24.3.0
+devservices==1.2.1
+flake8==7.0.0
+freezegun==1.2.2
+honcho==1.1.0
+pytest==8.3.3
+pytest-cov==4.1.0
+pytest-watch==4.2.0
 time-machine==2.13.0
 
 # for typing

requirements.txt

@@ -1,18 +1,14 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
-black==24.3.0
 blinker==1.5
 click==8.1.7
 clickhouse-driver==0.2.9
 confluent-kafka==2.7.0
 datadog==0.21.0
-devservices==1.2.1
-flake8==7.0.0
 Flask==2.2.5
 google-cloud-storage==2.18.0
 googleapis-common-protos==1.63.2
 google-api-core==2.19.1
-honcho==1.1.0
 python-jose[cryptography]==3.3.0
 jsonschema==4.23.0
 fastjsonschema==2.16.2
@@ -21,9 +17,6 @@ parsimonious==0.10.0
 progressbar2==4.2.0
 protobuf==5.29.5
 proto-plus==1.24.0
-pytest==8.3.3
-pytest-cov==4.1.0
-pytest-watch==4.2.0
 python-dateutil==2.8.2
 python-rapidjson==1.8
 redis==4.5.4
@@ -46,4 +39,3 @@ PyYAML==6.0
 sqlparse==0.5.0
 google-api-python-client==2.88.0
 sentry-usage-accountant==0.0.11
-freezegun==1.2.2

snuba/cli/devserver.py

@@ -3,7 +3,6 @@
 from subprocess import call, list2cmdline
 
 import click
-from honcho.manager import Manager
 
 from snuba import settings
 
@@ -24,6 +23,8 @@
 def devserver(*, bootstrap: bool, workers: bool, log_level: str) -> None:
     "Starts all Snuba processes for local development."
 
+    from honcho.manager import Manager
+
     os.environ["PYTHONUNBUFFERED"] = "1"
 
     if bootstrap: