Merge branch 'main' into mod_dash

.github/workflows/tests.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: niden/actions-memcached@v7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Prepare for Installing Dependencies
@@ -56,4 +56,3 @@ jobs:
       with:
         fail_ci_if_error: true
         verbose: true
-

deploy/travis/before_install

@@ -16,3 +16,4 @@ if [ $(echo "$(lsb_release -rs) > 20" | bc) -eq 1 ]; then
 fi
 curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
 sudo python2 get-pip.py
+sudo python2 -m pip install --upgrade pip==20.1

deploy/travis/install

@@ -2,6 +2,7 @@
 set -euf -o pipefail
 
 if [ "$TRAVIS_JOB" = "test" ]; then
+    sudo apt-get remove -y libhashkit2
     sudo apt-get install -y $(cat esp/packages_base.txt | grep -v ^memcached | grep -v ^postgres | grep -v ^libpq-dev | grep -v ^.*pip)
     esp/packages_base_manual_install.sh
     pip2 install -r esp/requirements.txt -q --log pip.log || (tail pip.log && exit 1)

esp/packages_base.txt

@@ -23,3 +23,6 @@ libc-ares2
 libev4
 git-core
 libfreetype6-dev
+libhashkit-dev
+libhashkit2
+libmemcached11