Skip to content

Commit

Permalink
Upgrade p4python to 2020.1 (#179)
Browse files Browse the repository at this point in the history
  • Loading branch information
ca-johnson authored Sep 3, 2020
1 parent d509189 commit c482e60
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions ci/install_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest==4.5.0;
pylint==2.3.1;
pytest==4.5.0
pylint==2.3.1
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
p4python==2018.2.1743033
p4python==2020.1.1983437

0 comments on commit c482e60

Please sign in to comment.