WIP: Drop dh-virtualenv for securedrop-client

freedomofpress · Sep 7, 2022 · a580cf0 · a580cf0
1 parent 5b423ac
commit a580cf0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/...p-client/debian/securedrop-client.install → securedrop-client/debian/install b/...p-client/debian/securedrop-client.install → securedrop-client/debian/install
diff --git a/securedrop-client/debian/rules b/securedrop-client/debian/rules
@@ -1,23 +1,16 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python-virtualenv
+	dh $@ --buildsystem=none
 
-REQUIREMENTS_FILE=requirements/build-requirements.txt
+PIP_ARGS=--ignore-installed --no-index --find-links $(WHEELS_DIR) --no-deps --no-cache-dir --no-use-pep517
 
-override_dh_virtualenv:
-	test -e $(REQUIREMENTS_FILE)
-	dh_virtualenv \
-		--python /usr/bin/python3 \
-		--use-system-packages \
-		--extra-pip-arg "--ignore-installed" \
-		--extra-pip-arg "--no-index" \
-		--extra-pip-arg "--find-links" \
-		--extra-pip-arg "$(WHEELS_DIR)" \
-		--extra-pip-arg "--no-deps" \
-		--extra-pip-arg "--no-cache-dir" \
-		--extra-pip-arg "--no-use-pep517" \
-		--requirements $(REQUIREMENTS_FILE)
+override_dh_auto_install:
+	virtualenv --system-site-packages debian/$(PKG_NAME)/opt/venvs/$(PKG_NAME)
+	./debian/$(PKG_NAME)/opt/venvs/$(PKG_NAME)/bin/pip install $(PIP_ARGS) -r requirements/build-requirements.txt
+	./debian/$(PKG_NAME)/opt/venvs/$(PKG_NAME)/bin/pip install $(PIP_ARGS) .
+	find ./debian/$(PKG_NAME)/ -type f -exec sed -i "s#$(shell pwd)/debian/$(PKG_NAME)##" {} \;
+	dh_auto_install $@
 
 override_dh_strip_nondeterminism:
 	find ./debian/ -type f -name '*.pyc' -delete

diff --git a/securedrop-client/debian/securedrop-client.triggers b/securedrop-client/debian/securedrop-client.triggers