aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <neil.williams@linaro.org>2018-09-19 00:36:45 +0100
committerNeil Williams <neil.williams@linaro.org>2018-09-19 01:29:50 +0100
commitd17a745867bc8c03191cc41d3ed4e7467f162347 (patch)
tree2c75082fed63609a387b2e8ff75f556e9533a0d2
parent81119f82174adb242758812db43bc38e0b885721 (diff)
Remove unused dependencies from calculated requirements
Remove system dependencies from requirements support as the CI images do not need this list. Retain support for future usage. Signed-off-by: Neil Williams <neil.williams@linaro.org>
-rw-r--r--doc/v2/debian.rst6
-rw-r--r--share/requirements/debian/buster.yaml9
-rw-r--r--share/requirements/debian/sid.yaml0
-rw-r--r--share/requirements/debian/stretch.yaml52
-rw-r--r--share/requirements/debian/unstable.yaml9
5 files changed, 2 insertions, 74 deletions
diff --git a/doc/v2/debian.rst b/doc/v2/debian.rst
index 783655629..bbe612f0d 100644
--- a/doc/v2/debian.rst
+++ b/doc/v2/debian.rst
@@ -234,7 +234,7 @@ Python3 dependencies include:
python3-django (>= 1.8), python3-django-auth-ldap (>= 1.1.8),
python3-django-restricted-resource (>= 2015.09),
python3-django-tables2 (>=1.2), python3-docutils, python3-jinja2,
- python3-markdown, python3-psycopg2, python3-simplejson,
+ python3-psycopg2, python3-simplejson,
python3-voluptuous (>= 0.8.8), python3:any (>= 3.3.2-2~),
python3-configobj, python3-magic, python3-netifaces (>=0.10.0),
python3-nose, python3-pexpect (>= 4.2), python3-pyudev (>= 0.21),
@@ -471,7 +471,6 @@ format which mimics ``requirements.txt``::
django>=1.10
docutils>=0.6
jinja2
- markdown>=2.0.3
nose
psycopg2
pytz
@@ -494,7 +493,6 @@ Outputting a list of binary package names
python3-django
python3-docutils
python3-jinja2
- python3-markdown
python3-nose
python3-psycopg2
python3-tz
@@ -536,7 +534,7 @@ other ``apt-get`` commands before appending the list of packages.
lava-common postgresql-common postgresql-client postgresql systemd-sysv libjs-jquery-typeahead libjs-jquery-flot \
libjs-jquery-watermark libjs-jquery-ui libjs-jquery libjs-jquery-cookie libjs-excanvas python3-setuptools iproute2 \
gunicorn3 adduser apache2 python3-django-auth-ldap python3-yaml python3-dateutil python3-django-restricted-resource \
- python3-django-tables2 python3-django python3-docutils python3-jinja2 python3-markdown python3-nose python3-psycopg2 \
+ python3-django-tables2 python3-django python3-docutils python3-jinja2 python3-nose python3-psycopg2 \
python3-tz python3-zmq python3-requests python3-simplejson python3-voluptuous
.. index:: javascript
diff --git a/share/requirements/debian/buster.yaml b/share/requirements/debian/buster.yaml
index 0fdced8c6..14111e63a 100644
--- a/share/requirements/debian/buster.yaml
+++ b/share/requirements/debian/buster.yaml
@@ -25,9 +25,6 @@ lava-server:
name: python3-docutils
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
nose:
name: python3-nose
psycopg2:
@@ -53,9 +50,6 @@ lava-dispatcher:
name: python3-magic
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
netifaces:
version: ">=0.10.0"
name: python3-netifaces
@@ -64,9 +58,6 @@ lava-dispatcher:
pexpect:
version: ">=4.2"
name: python3-pexpect
- pyserial:
- version: ">=2.6"
- name: python3-serial
pytz:
name: python3-tz
pyudev:
diff --git a/share/requirements/debian/sid.yaml b/share/requirements/debian/sid.yaml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/share/requirements/debian/sid.yaml
diff --git a/share/requirements/debian/stretch.yaml b/share/requirements/debian/stretch.yaml
index e7c35a5b4..8131a4860 100644
--- a/share/requirements/debian/stretch.yaml
+++ b/share/requirements/debian/stretch.yaml
@@ -22,9 +22,6 @@ lava-server:
name: python3-docutils
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
nose:
name: python3-nose
psycopg2:
@@ -40,41 +37,6 @@ lava-server:
voluptuous:
version: ">=0.8.8"
name: python3-voluptuous
- apache2:
- system: True
- adduser:
- system: True
- gunicorn3:
- system: True
- iproute2:
- system: True
- python3-setuptools:
- system: True
- libjs-excanvas:
- system: True
- libjs-jquery-cookie:
- system: True
- libjs-jquery:
- system: True
- libjs-jquery-ui:
- system: True
- libjs-jquery-watermark:
- system: True
- libjs-jquery-flot:
- system: True
- libjs-jquery-typeahead:
- system: True
- systemd-sysv:
- system: True
- # may be removed when separate postgresql docker support is tested.
- postgresql:
- system: True
- postgresql-client:
- system: True
- postgresql-common:
- system: True
- lava-common:
- system: True
lava-dispatcher:
PyYAML:
@@ -85,9 +47,6 @@ lava-dispatcher:
name: python3-magic
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
netifaces:
version: ">=0.10.0"
name: python3-netifaces
@@ -96,9 +55,6 @@ lava-dispatcher:
pexpect:
version: ">=4.2"
name: python3-pexpect
- pyserial:
- version: ">=2.6"
- name: python3-serial
pytz:
name: python3-tz
pyudev:
@@ -113,14 +69,6 @@ lava-dispatcher:
name: python3-setproctitle
guestfs:
name: python3-guestfs
- python3-setuptools:
- system: True
- systemd-sysv:
- system: True
- file:
- system: True
- lava-common:
- system: True
lava-common:
nose:
diff --git a/share/requirements/debian/unstable.yaml b/share/requirements/debian/unstable.yaml
index 0fdced8c6..14111e63a 100644
--- a/share/requirements/debian/unstable.yaml
+++ b/share/requirements/debian/unstable.yaml
@@ -25,9 +25,6 @@ lava-server:
name: python3-docutils
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
nose:
name: python3-nose
psycopg2:
@@ -53,9 +50,6 @@ lava-dispatcher:
name: python3-magic
jinja2:
name: python3-jinja2
- markdown:
- version: ">=2.0.3"
- name: python3-markdown
netifaces:
version: ">=0.10.0"
name: python3-netifaces
@@ -64,9 +58,6 @@ lava-dispatcher:
pexpect:
version: ">=4.2"
name: python3-pexpect
- pyserial:
- version: ">=2.6"
- name: python3-serial
pytz:
name: python3-tz
pyudev: