Skip to content

Commit e5d4a1b

Browse files
authored
Merge pull request #204 from techtonik/patch-2
Use recommended pygit2 version for snap builds
2 parents 99b06ba + 3489a7c commit e5d4a1b

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Note that the installation **won't interfere** with your Git installation in any
2525
way, you can keep using Git, and switch between Git and Gitless seamlessly.
2626

2727
We currently require Git (1.7.12+) to be installed (but this requirement is
28-
going to disappear soon once we finish with our migration to pygit2).
28+
going to disappear soon once we finish with our migration to [pygit2](https://github.com/libgit2/pygit2)).
2929

3030

3131
### Binary releases (macOS and Linux only)

gitless/cli/gl_init.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
def parser(subparsers, _):
1818
"""Adds the init parser to the given subparsers object."""
1919
desc = (
20-
'create an empty Gitless\'s repository or create one from an existing '
21-
'remote repository')
20+
'create an empty git repository or clone remote')
2221
init_parser = subparsers.add_parser(
2322
'init', help=desc, description=desc.capitalize())
2423
init_parser.add_argument(

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# make sure to update setup.py
2+
13
pygit2==0.26.4 # requires libgit2 0.26
24
clint==0.5.1
35
sh==1.12.14;sys_platform!='win32'

setup.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@
6767
url='http://gitless.com',
6868
packages=['gitless', 'gitless.cli'],
6969
install_requires=[
70-
'pygit2>=0.24.0',
71-
'clint>=0.3.6',
72-
'sh>=1.11' if sys.platform != 'win32' else 'pbs>=0.11'
70+
# make sure it matches requirements.txt
71+
'pygit2==0.26.4', # requires libgit2 0.26
72+
'clint==0.5.1',
73+
'sh==1.12.14' if sys.platform != 'win32' else 'pbs==0.110'
7374
],
7475
license='MIT',
7576
classifiers=(

snap/snapcraft.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ apps:
2727
parts:
2828
libgit2:
2929
plugin: cmake
30-
source: https://github.com/libgit2/libgit2/archive/v0.27.0.tar.gz
30+
# https://www.pygit2.org/install.html#version-numbers
31+
source: https://github.com/libgit2/libgit2/archive/v0.26.8.tar.gz
3132
build-packages:
3233
- libssl-dev
3334

0 commit comments

Comments
 (0)