Next Generation Checkbox (CLI)

Merge ~sylvain-pineau/checkbox-ng:avocado_allergy into checkbox-ng:master

  1. Git
  2. lp:~sylvain-pineau/checkbox-ng
  3. avocado_allergy
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4cc527e005c583ed22d64acde6c303929399dbd2
Merged at revision: 7b9427b10951eb5a2d6e09983aca55fa27c29466
Proposed branch: ~sylvain-pineau/checkbox-ng:avocado_allergy
Merge into: checkbox-ng:master
Diff against target: 37 lines (+1/-4)
3 files modified
HACKING.md (+1/-2)
requirements/deb-core.txt (+0/-1)
setup.py (+0/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+376118@code.launchpad.net

Description of the change

avocado allergy

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/HACKING.md b/HACKING.md
index 9facace..4d639f4 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -3,8 +3,7 @@
33
4To install all dependencies run:4To install all dependencies run:
55
6 sudo apt install -yq build-essential intltool lsb-release policykit-1 python3-virtualenv virtualenv python3 python3-distutils-extra python3-guacamole python3-jinja2 python3-padme python3-pkg-resources python3-setuptools python3-xlsxwriter python3-pip6 sudo apt install -yq build-essential intltool lsb-release policykit-1 python3-virtualenv virtualenv python3 python3-distutils-extra python3-jinja2 python3-padme python3-pkg-resources python3-setuptools python3-xlsxwriter python3-pip python3-crypto
7 sudo pip3 install pycrypto
87
9## Creating venv8## Creating venv
109
diff --git a/requirements/deb-core.txt b/requirements/deb-core.txt
index 72c9f82..f4fcdc4 100644
--- a/requirements/deb-core.txt
+++ b/requirements/deb-core.txt
@@ -1,6 +1,5 @@
1policykit-11policykit-1
2python3-crypto2python3-crypto
3python3-guacamole
4python3-jinja23python3-jinja2
5python3-padme4python3-padme
6python3-urwid5python3-urwid
diff --git a/setup.py b/setup.py
index ff58236..aa3de34 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,6 @@ if on_rtd:
45 install_requires = []45 install_requires = []
46else:46else:
47 install_requires = [47 install_requires = [
48 'guacamole >= 0.9',
49 'requests >= 1.0',48 'requests >= 1.0',
50 'urwid >= 1.1.1',49 'urwid >= 1.1.1',
51 'Jinja2 >= 2.7',50 'Jinja2 >= 2.7',

Subscribers

People subscribed via source and target branches