Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git-p4: python 3 compatibility #673

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
+149 −98
Open

git-p4: python 3 compatibility #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
89b61ad
git-p4: make python2.7 the oldest supported version
yangskyboxlabs Dec 6, 2019
5e16495
git-p4: change the expansion test from basestring to list
seraphire Dec 3, 2019
7e7b192
git-p4: remove string type aliasing
yangskyboxlabs Dec 13, 2019
5cf8e23
git-p4: encode/decode communication with p4 for python3
yangskyboxlabs Nov 27, 2019
ffa820f
git-p4: encode/decode communication with git for python 4
yangskyboxlabs Nov 27, 2019
54f456c
git-p4: convert path to unicode before processing them
yangskyboxlabs Dec 4, 2019
afc5ffb
git-p4: open .gitp4-usercache.txt in text mode
yangskyboxlabs Nov 27, 2019
64c5255
git-p4: use marshal format version 2 when sending to p4
yangskyboxlabs Dec 6, 2019
6d12c43
git-p4: fix freezing while waiting for fast-import progress
yangskyboxlabs Dec 6, 2019
b44af2b
git-p4: use functools.reduce instead of reduce
yangskyboxlabs Dec 6, 2019
566e00d
git-p4: use dict.items() iteration for python3 compatibility
yangskyboxlabs Dec 6, 2019
d625855
git-p4: simplify regex pattern generation for parsing diff-tree
yangskyboxlabs Dec 6, 2019
56adf18
git-p4: use python3's input() everywhere
yangskyboxlabs Dec 6, 2019
050387c
ci: run t98xx tests using python3 for gcc builds
szeder Jan 24, 2020
de2b2c3
git-p4: simplify formatting of percentage values for output
yangskyboxlabs Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/lib.sh
View file
Open in desktop
Expand Up @@ -162,6 +162,9 @@ linux-clang|linux-gcc)
if [ "$jobname" = linux-gcc ]
then
export CC=gcc-8
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi

export GIT_TEST_HTTPD=true
Expand All @@ -182,6 +185,9 @@ osx-clang|osx-gcc)
if [ "$jobname" = osx-gcc ]
then
export CC=gcc-9
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi

# t9810 occasionally fails on Travis CI OS X
Expand Down