pagure

Clone

#4692 pygit2 1.0.0 support
Merged 4 years ago by pingou. Opened 4 years ago by jlanda.
jlanda/pagure fix-pip-container  into  master

file modified
-5 
@@ -25,11 +25,6 @@ 
 

      && GIT_TRACE=1 GIT_CURL_VERBOSE=1 git clone -b $BRANCH $REPO \
 

      && chmod +x /pagure/dev/containers/tox_py3.sh
 

  

- # Install pygit2 manually, outside of the virtualenv since it is tightly coupled
 

- # which the version of libgit2 installed on the system.
 

- RUN pip3 install "pygit2 <= `rpm -q libgit2 --queryformat='%{version}'`" && \
 

-     cd /pagure
 

- 

  WORKDIR /pagure
 

  ENTRYPOINT ["/pagure/dev/containers/tox_py3.sh"]
 

  CMD []

file modified
+7 -1 
@@ -120,7 +120,13 @@ 
 

          # Not tested and no idea how to test it, but better safe than sorry
 

          flask.abort(404, description="File not found")
 

  

-     if isinstance(blob_or_tree, pygit2.TreeEntry):  # Returned a file
 

+     is_file = False
 

+     try:
 

+         is_file = isinstance(blob_or_tree, pygit2.TreeEntry)
 

+     except AttributeError:
 

+         is_file = isinstance(blob_or_tree, pygit2.Blob)
 

+ 

+     if is_file:
 

          filename = blob_or_tree.name
 

          name, ext = os.path.splitext(filename)
 

          blob_obj = repo_obj[blob_or_tree.oid]

pygit2 has some breaking changes on 1.0.0 release 0, modify our doc server to support both old and new pygit2 versions

:thumbsup:

and with 1.0.0 they started to not match libgit2's versioning on their releases, so remove the specific version pip install :)

2 new commits added

  • doc_server: pygit2 1.0.0 support
  • Remove old libgit2 version based pygit2 installation
4 years ago

2 new commits added

  • doc_server: pygit2 1.0.0 support
  • Remove old libgit2 version based pygit2 installation
4 years ago

2 new commits added

  • doc_server: pygit2 1.0.0 support
  • Remove old libgit2 version based pygit2 installation
4 years ago

pretty please pagure-ci rebuild
4 years ago

pretty please pagure-ci rebuild
4 years ago

rebased onto ce29aa83501564a1829dcb819e37f8f5035976b3
4 years ago

pretty please pagure-ci rebuild
4 years ago

rebased onto d4703b0374361d852710f8a40b6247ef5682c5ea
4 years ago

rebased onto c94d5dd
4 years ago

2 new commits added

  • doc_server: pygit2 1.0.0 support
  • Remove old libgit2 version based pygit2 installation
4 years ago

After some fights, now seems that I managed to implement proper multiversion support :)
Edited 4 years ago by jlanda

It's green!!

Let's get this in :)

Pull-Request has been merged by pingou
4 years ago
Changes Summary 2
+0 -5
file changed
dev/containers/fedora-pip-py3
+7 -1
file changed
pagure/docs_server.py
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.