Skip to content

Commit

Permalink
Merge pull request #112 from freedomofpress/111-dh-virtualenv
Browse files Browse the repository at this point in the history
Improve dh-virtualenv for securedrop-client
  • Loading branch information
redshiftzero authored Jan 13, 2020
2 parents cb8fdca + a264a33 commit 3091c70
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
10 changes: 9 additions & 1 deletion securedrop-client/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
dh $@ --with python-virtualenv

override_dh_virtualenv:
dh_virtualenv --python /usr/bin/python3 --setuptools -S --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt
dh_virtualenv \
--python /usr/bin/python3 \
--setuptools \
--use-system-packages \
--index-url https://dev-bin.ops.securedrop.org/simple \
--extra-pip-arg "--ignore-installed" \
--extra-pip-arg "--no-deps" \
--extra-pip-arg "--no-cache-dir" \
--requirements build-requirements.txt

override_dh_strip_nondeterminism:
find ./debian/ -type f -name '*.pyc' -delete
Expand Down
13 changes: 11 additions & 2 deletions securedrop-export/debian/rules
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
#!/usr/bin/make -f

%:
dh $@ --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt
dh $@ --with python-virtualenv

override_dh_virtualenv:
dh_virtualenv \
--python /usr/bin/python3 \
--setuptools \
--index-url https://dev-bin.ops.securedrop.org/simple \
--extra-pip-arg "--ignore-installed" \
--extra-pip-arg "--no-deps" \
--extra-pip-arg "--no-cache-dir" \
--requirements build-requirements.txt

override_dh_strip_nondeterminism:
find ./debian/ -type f -name '*.pyc' -delete
find ./debian/ -type f -name 'pip-selfcheck.json' -delete
find -type f -name RECORD -exec sed -i -e '/.*\.pyc.*/d' {} +
dh_strip_nondeterminism $@

13 changes: 11 additions & 2 deletions securedrop-proxy/debian/rules
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
#!/usr/bin/make -f

%:
dh $@ --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt
dh $@ --with python-virtualenv

override_dh_virtualenv:
dh_virtualenv \
--python /usr/bin/python3 \
--setuptools \
--index-url https://dev-bin.ops.securedrop.org/simple \
--extra-pip-arg "--ignore-installed" \
--extra-pip-arg "--no-deps" \
--extra-pip-arg "--no-cache-dir" \
--requirements build-requirements.txt

override_dh_strip_nondeterminism:
find ./debian/ -type f -name '*.pyc' -delete
find ./debian/ -type f -name 'pip-selfcheck.json' -delete
find -type f -name RECORD -exec sed -i -e '/.*\.pyc.*/d' {} +
dh_strip_nondeterminism $@

0 comments on commit 3091c70

Please sign in to comment.