[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [fallback-scripts/master] Travis: Conditionally install Python 2 requirements



commit de866052a5f686a8d4275c4a0fcee433ac906168
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Sun Dec 1 18:33:47 2019 +1000

    Travis: Conditionally install Python 2 requirements
    
    Part of 28863.
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cbb90f2..a0ab3f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,10 +86,13 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
   - python --version
+  ## Are we running python 2?
+  - if python --version 2>&1 | cut -d" " -f2 | grep -q '2[.]'; then PY2=1; else PY2= ; fi
   ## We could install stem's dependencies, but they are all optional
   - pip install -U pip
   - pip install -r requirements.txt
-  # Now list installed python package versions
+  - if [[ "$PY2" ]]; then pip install -r requirements-python2.txt; fi
+  ## Now list installed python package versions
   - pip list
 
 script:



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits