From c482e6051e5dc263d66a03bfbf9e50cfc73cafc4 Mon Sep 17 00:00:00 2001
From: Carl Johnson <carljohnson@improbable.io>
Date: Thu, 3 Sep 2020 10:29:30 +0100
Subject: [PATCH] Upgrade p4python to 2020.1 (#179)

---
 .travis.yml             |  1 +
 ci/install_linux.sh     | 11 -----------
 ci/requirements.txt     |  4 ++--
 python/requirements.txt |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbb3492..7e8652d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
   - pip install -U pip
 install: 
   - pip install -r ./ci/requirements.txt
+  - pip install -r ./python/requirements.txt
   - ./ci/install_$TRAVIS_OS_NAME.sh
 script:
   - ./ci/test.sh
diff --git a/ci/install_linux.sh b/ci/install_linux.sh
index 693da9d..b3d74fd 100755
--- a/ci/install_linux.sh
+++ b/ci/install_linux.sh
@@ -7,17 +7,6 @@ wget http://www.perforce.com/downloads/perforce/r18.2/bin.linux26x86_64/p4d
 sudo chmod +x p4d
 sudo mv p4d /usr/local/bin/p4d
 
-# Build P4Python from source, pip install fails as we cannot connect to ftp.perforce.com from travis agents
-wget http://www.perforce.com/downloads/perforce/r18.2/bin.linux26x86_64/p4api.tgz
-# Detect concrete version number inside p4api.tgz, changes as new versions are published
-P4API_VERSION=$(tar -tf p4api.tgz | head -1 || true)
-tar xzf p4api.tgz --directory /tmp/
-wget https://files.pythonhosted.org/packages/36/5a/0a1b192cdecd31cb8bc0d0ba39c73ffd84ce823053d0004823a1fdbe1440/p4python-2018.2.1743033.tar.gz
-tar xfz p4python-2018.2.1743033.tar.gz --directory /tmp/
-pushd /tmp/p4python-2018.2.1743033/
-python setup.py install --apidir /tmp/${P4API_VERSION}
-popd
-
 # bk cli for integration tests
 wget https://github.com/buildkite/cli/releases/download/v1.0.0/bk-linux-amd64-1.0.0 -O bk
 sudo chmod +x bk
diff --git a/ci/requirements.txt b/ci/requirements.txt
index f2ef027..97c9348 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -1,2 +1,2 @@
-pytest==4.5.0;
-pylint==2.3.1;
\ No newline at end of file
+pytest==4.5.0
+pylint==2.3.1
diff --git a/python/requirements.txt b/python/requirements.txt
index 62be5ca..d35cf46 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1 +1 @@
-p4python==2018.2.1743033
\ No newline at end of file
+p4python==2020.1.1983437