Skip to content

Commit ec18288

Browse files
authored
Merge branch 'master' into fix-libgit2-v1.1.0-compatibility
2 parents 3889c75 + 225f236 commit ec18288

File tree

4 files changed

+26
-6
lines changed

4 files changed

+26
-6
lines changed

.appveyor.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
# Based on pygit2's appveyor config
2+
image: Visual Studio 2019
23
environment:
34
matrix:
45
- GENERATOR: 'Visual Studio 14'
56
PYTHON: 'C:\Python38\python.exe'
67
- GENERATOR: 'Visual Studio 14 Win64'
78
PYTHON: 'C:\Python38-x64\python.exe'
9+
- GENERATOR: 'Visual Studio 14'
10+
PYTHON: 'C:\Python39\python.exe'
11+
- GENERATOR: 'Visual Studio 14 Win64'
12+
PYTHON: 'C:\Python39-x64\python.exe'
813

914
init:
10-
- cmd: '%PYTHON% -m pip install -U nose wheel'
15+
- cmd: '%PYTHON% -m pip install -U pip'
16+
- cmd: '%PYTHON% -m pip install -U nose'
1117

12-
build: off
18+
build_script:
19+
# build and install `gl` binary (end to end test also use it)
20+
- cmd: '%PYTHON% -m pip install -r requirements.txt .'
1321

1422
before_test:
1523
- cmd: git config --global user.name "appveyor-test"
1624
- cmd: git config --global user.email "appveyor@test.com"
1725

1826
test_script:
27+
- cmd: dir /a:h
28+
- cmd: gl
1929
- ps: |
20-
# e2e tests require `gl` binary
21-
&$env:PYTHON -m pip install -r requirements.txt .
2230
# 'gl' is installed in Python Scripts directory
2331
$env:PATH += ";$(Split-Path $env:PYTHON)\Scripts"
2432
&$env:PYTHON setup.py nosetests --logging-level=WARN --with-xunit

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ addons:
55
packages:
66
- snapcraft
77
python:
8-
- '3.8'
8+
- '3.8'
9+
- '3.9'
10+
911
env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib
1012
before_install: ./.travis.sh
1113
install: pip install -r requirements.txt .

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@ snap install --channel=beta gitless
9898

9999
You can also use the `edge` channel to install the most recent build.
100100

101+
### Installing via the Arch User Repository
102+
103+
If you are using [Arch Linux](https://www.archlinux.org/) or any of
104+
its derivatives, you can use your favorite
105+
[AUR Helper](https://wiki.archlinux.org/index.php/AUR_helpers) and install:
106+
- [gitless](https://aur.archlinux.org/packages/gitless/) for the latest
107+
released version
108+
- [gitless-git](https://aur.archlinux.org/packages/gitless-git/) to
109+
build the latest version straight from this repo
110+
101111
Documentation
102112
-------------
103113

gitless/cli/gl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
try:
4040
pprint.DISABLE_COLOR = not repo.config.get_bool('color.ui')
4141
except pygit2.GitError:
42-
prrint.DISABLE_COLOR = (
42+
pprint.DISABLE_COLOR = (
4343
repo.config['color.ui'] in ['no', 'never'])
4444
except (core.NotInRepoError, KeyError):
4545
pass

0 commit comments

Comments
 (0)