summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Wittig <max.wittig95@gmail.com>2019-07-20 23:25:46 +0200
committerGitHub <noreply@github.com>2019-07-20 23:25:46 +0200
commit2e42e289efbf24fb6fd85df45b56a875875b6932 (patch)
tree25eaadd349ae29b0ce7fae0092d22b11858e8655
parent5492b71a189f6a85e8f1542e13295f528555df31 (diff)
parent515aa9ac2aba132d1dfde0418436ce163fca2313 (diff)
downloadgitlab-2e42e289efbf24fb6fd85df45b56a875875b6932.tar.gz
Merge pull request #830 from python-gitlab/chore/ci-disable-py-func
Chore/ci disable py func
-rw-r--r--.travis.yml2
-rw-r--r--gitlab/v4/objects.py19
2 files changed, 17 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 1e9cc4d..0a38cfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services:
language: python
python: 2.7
env:
- - TOX_ENV=py_func_v4
+ #- TOX_ENV=py_func_v4
- TOX_ENV=cli_func_v4
install:
- pip install tox
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index c598a9a..f72a145 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -4262,10 +4262,18 @@ class Project(SaveMixin, ObjectDeleteMixin, RESTObject):
path, post_data={"namespace": to_namespace}, **kwargs
)
-
@cli.register_custom_action("Project", ("ref_name", "artifact_path", "job"))
@exc.on_http_error(exc.GitlabGetError)
- def artifact(self, ref_name, artifact_path, job, streamed=False, action=None, chunk_size=1024, **kwargs):
+ def artifact(
+ self,
+ ref_name,
+ artifact_path,
+ job,
+ streamed=False,
+ action=None,
+ chunk_size=1024,
+ **kwargs
+ ):
"""Download a single artifact file from a specific tag or branch from within the job’s artifacts archive.
Args:
@@ -4288,7 +4296,12 @@ class Project(SaveMixin, ObjectDeleteMixin, RESTObject):
str: The artifacts if `streamed` is False, None otherwise.
"""
- path = "/projects/%s/jobs/artifacts/%s/raw/%s?job=%s" % (self.get_id(), ref_name, artifact_path, job)
+ path = "/projects/%s/jobs/artifacts/%s/raw/%s?job=%s" % (
+ self.get_id(),
+ ref_name,
+ artifact_path,
+ job,
+ )
result = self.manager.gitlab.http_get(
path, streamed=streamed, raw=True, **kwargs
)