[cloudstack] branch marvin3 updated (de8c2b6 -> c014192)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a change to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from de8c2b6  try`n'hack python2/python3 mix in travis
     new 98bfae1  ubuntu py3 deps for marvin
     new c014192  double python install

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/control                 | 2 +-
 tools/travis/before_install.sh | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

[cloudstack] 01/02: ubuntu py3 deps for marvin

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 98bfae104a0bad9a7811158c0d2546ad0cc3a7e6
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Wed Mar 17 15:25:42 2021 +0100

    ubuntu py3 deps for marvin
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 15d3fb5..82cfecd 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Description: The CloudStack documentation
 
 Package: cloudstack-marvin
 Architecture: all
-Depends: ${misc:Depends}, python-pip, python-dev, libffi-dev
+Depends: ${misc:Depends}, python3-pip, python3-dev, libffi-dev
 Description: The CloudStack Marvin library
 
 Package: cloudstack-integration-tests

[cloudstack] 02/02: double python install

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit c01419272c2377bedced1ba22361ee83f585c28d
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Wed Mar 17 15:27:50 2021 +0100

    double python install
---
 tools/travis/before_install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index d2128e4..a20f4a8 100755
--- a/tools/travis/before_install.sh
+++ b/tools/travis/before_install.sh
@@ -83,9 +83,11 @@ fi
 
 sudo apt-get -q -y -V install freeipmi-common libfreeipmi16 libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython-dev libssl-dev libffi-dev python-openssl build-essential --no-install-recommends > /dev/null
 
-#sudo apt-get -y install python3 python3-pip
-#sudo apt-get -y install python3-devel # in order to be able to pip3 install pycrypto
-#echo `python3 --version | cut -d ' ' -f 2` >> /home/travis/build/apache/cloudstack/.python-version
+sudo apt-get -y install python3 python3-pip
+sudo apt-get -y install python3-dev # in order to be able to pip3 install pycrypto
+# for now we need both:
+sudo apt-get -y install python2 python2-pip
+sudo apt-get -y install python2-dev # in order to be able to pip3 install pycrypto
 
 pyenv install `cat /home/travis/build/apache/cloudstack/.python-version`
 
@@ -120,6 +122,7 @@ echo -e "\nInstalling some python packages: "
 for ((i=0;i<$RETRY_COUNT;i++))
 do
   python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog
+  python2 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid >> /tmp/piplog
   if [[ $? -eq 0 ]]; then
     echo -e "\npython packages installed successfully"
     break;