small fixx

MHA-Team · Sep 11, 2019 · e63fab8 · e63fab8
1 parent ccb8b0c
commit e63fab8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 50 deletions.
diff --git a/menu/dependency/dependency.yml b/menu/dependency/dependency.yml
@@ -45,46 +45,8 @@
         - { package: 'gawk' }
         - { package: 'python-lxml' }
         - { package: 'acl' }
+        - { package: 'python-apt' }
 
-
-      # apt:
-      #   name:
-      #     - fuse
-      #     - nano
-      #     - fail2ban
-      #     - wget
-      #     - lsb-release
-      #     - figlet
-      #     - update-notifier-common
-      #     - software-properties-common
-      #     - unzip
-      #     - glances
-      #     - python-pip
-      #     - python3-pip
-      #     - python-passlib
-      #     - zip
-      #     - curl
-      #     - man-db
-      #     - htop
-      #     - openssh-server
-      #     - dirmngr
-      #     - npm
-      #     - zip
-      #     - apt-transport-https
-      #     - ca-certificates
-      #     - tree
-      #     - ncdu
-      #     - ctop
-      #     - dialog
-      #     - dnsutils
-      #     - mc
-      #     - apache2-utils
-      #     - lsof
-      #     - pwgen
-      #     - gawk
-      #     - python-lxml
-      #     - acl
-      #     - bc
     - name: Update pip packages for python3
       pip:
         name:

diff --git a/menu/dependency/dependencydeb.yml b/menu/dependency/dependencydeb.yml
@@ -47,6 +47,7 @@
         - acl
         - bc
         - gnupg2
+        - python-apt
 
     - name: Update pip packages for python3
       pip:

diff --git a/menu/functions/install.sh b/menu/functions/install.sh
@@ -319,27 +319,37 @@ pythonstart() {
 
   ansible="2.8.2"
   pip="19.1.1"
-
+	
   apt-get install -y --reinstall \
-    nano \
-    git \
-    build-essential \
-    libssl-dev \
-    libffi-dev \
-    python3-dev \
-    python3-pip \
-    python-dev \
-    python-pip
+  nano \
+  git \
+  build-essential \
+  libssl-dev \
+  libffi-dev \
+  python3-dev \
+  python3-testresources \
+  python3-pip \
+  python3-testresources \
+  python-dev \
+  python-pip
   python3 -m pip install --disable-pip-version-check --upgrade --force-reinstall pip==${pip}
   python3 -m pip install --disable-pip-version-check --upgrade --force-reinstall setuptools
   python3 -m pip install --disable-pip-version-check --upgrade --force-reinstall \
     pyOpenSSL \
     requests \
-    netaddr
+    netaddr \
+	pipenv
   python -m pip install --disable-pip-version-check --upgrade --force-reinstall pip==${pip}
   python -m pip install --disable-pip-version-check --upgrade --force-reinstall setuptools
   python -m pip install --disable-pip-version-check --upgrade --force-reinstall ansible==${1-$ansible}
 
+	pip install -U --force-reinstall pip==9.0.3
+	pip3 install -U --force-reinstall pip==9.0.3
+	pip install --upgrade --force-reinstall pip==9.0.3
+	pip install PyYAML --disable-pip-version-check
+	pip install --upgrade pip
+	pip install docker-py --ignore-installed PyYAML
+
   ## Copy pip to /usr/bin
   cp /usr/local/bin/pip /usr/bin/pip
   cp /usr/local/bin/pip3 /usr/bin/pip3