Merge pull request #2 from python-gitlab/master

mdhausman · web-flow · commit 12bbd094143a · 2017-07-31T20:29:46.000-04:00
Bringing our fork up to date with the main repo
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ addons:
 language: python
 python: 2.7
 env:
+  - TOX_ENV=py36
   - TOX_ENV=py35
   - TOX_ENV=py34
   - TOX_ENV=py27
diff --git a/docs/gl_objects/projects.py b/docs/gl_objects/projects.py
@@ -178,11 +178,11 @@
 result = project.repository_compare('master', 'branch1')
 
 # get the commits
-for i in commit:
-    print(result.commits)
+for commit in result['commits']:
+    print(commit)
 
 # get the diffs
-for file_diff in commit.diffs:
+for file_diff in result['diffs']:
     print(file_diff)
 # end repository compare
 
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -71,7 +71,7 @@ class Gitlab(object):
 
     def __init__(self, url, private_token=None, email=None, password=None,
                  ssl_verify=True, http_username=None, http_password=None,
-                 timeout=None, api_version='3'):
+                 timeout=None, api_version='3', session=None):
 
         self._api_version = str(api_version)
         self._url = '%s/api/v%s' % (url, api_version)
@@ -90,7 +90,7 @@ def __init__(self, url, private_token=None, email=None, password=None,
         self.http_password = http_password
 
         #: Create a session object for requests
-        self.session = requests.Session()
+        self.session = session or requests.Session()
 
         objects = importlib.import_module('gitlab.v%s.objects' %
                                           self._api_version)
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py
@@ -1286,16 +1286,16 @@ def changes(self, **kwargs):
 
     def merge(self, merge_commit_message=None,
               should_remove_source_branch=False,
-              merged_when_build_succeeds=False,
+              merge_when_build_succeeds=False,
               **kwargs):
         """Accept the merge request.
 
         Args:
             merge_commit_message (bool): Commit message
             should_remove_source_branch (bool): If True, removes the source
                                                 branch
-            merged_when_build_succeeds (bool): Wait for the build to succeed,
-                                               then merge
+            merge_when_build_succeeds (bool): Wait for the build to succeed,
+                                              then merge
 
         Returns:
             ProjectMergeRequest: The updated MR
@@ -1312,8 +1312,8 @@ def merge(self, merge_commit_message=None,
             data['merge_commit_message'] = merge_commit_message
         if should_remove_source_branch:
             data['should_remove_source_branch'] = True
-        if merged_when_build_succeeds:
-            data['merged_when_build_succeeds'] = True
+        if merge_when_build_succeeds:
+            data['merge_when_build_succeeds'] = True
 
         r = self.gitlab._raw_put(url, data=data, **kwargs)
         errors = {401: GitlabMRForbiddenError,
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -362,7 +362,7 @@ class GroupMember(GitlabObject):
     requiredCreateAttrs = ['access_level', 'user_id']
     optionalCreateAttrs = ['expires_at']
     requiredUpdateAttrs = ['access_level']
-    optionalCreateAttrs = ['expires_at']
+    optionalUpdateAttrs = ['expires_at']
     shortPrintAttr = 'username'
 
     def _update(self, **kwargs):
@@ -1244,16 +1244,16 @@ def changes(self, **kwargs):
 
     def merge(self, merge_commit_message=None,
               should_remove_source_branch=False,
-              merged_when_build_succeeds=False,
+              merge_when_pipeline_succeeds=False,
               **kwargs):
         """Accept the merge request.
 
         Args:
             merge_commit_message (bool): Commit message
             should_remove_source_branch (bool): If True, removes the source
                                                 branch
-            merged_when_build_succeeds (bool): Wait for the build to succeed,
-                                               then merge
+            merge_when_pipeline_succeeds (bool): Wait for the build to succeed,
+                                                 then merge
 
         Returns:
             ProjectMergeRequest: The updated MR
@@ -1270,8 +1270,8 @@ def merge(self, merge_commit_message=None,
             data['merge_commit_message'] = merge_commit_message
         if should_remove_source_branch:
             data['should_remove_source_branch'] = True
-        if merged_when_build_succeeds:
-            data['merged_when_build_succeeds'] = True
+        if merge_when_pipeline_succeeds:
+            data['merge_when_pipeline_succeeds'] = True
 
         r = self.gitlab._raw_put(url, data=data, **kwargs)
         errors = {401: GitlabMRForbiddenError,
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py35,py34,py27,pep8
+envlist = py36,py35,py34,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
