Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit274b3bf

Browse files
author
Gauvain Pocentek
committed
Merge branch 'master' into rework_api
2 parentsfe3a06c +cb8c1a1 commit274b3bf

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ addons:
1010
language:python
1111
python:2.7
1212
env:
13+
-TOX_ENV=py36
1314
-TOX_ENV=py35
1415
-TOX_ENV=py34
1516
-TOX_ENV=py27

‎AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Asher256@users.noreply.github.com <Asher256>
2020
Christian <cgumpert@users.noreply.github.com>
2121
Christian Wenk <christian.wenk@omicronenergy.com>
2222
Colin D Bennett <colin.bennett@harman.com>
23+
Cosimo Lupo <cosimo.lupo@daltonmaag.com>
2324
Crestez Dan Leonard <lcrestez@ixiacom.com>
2425
Daniel Kimsey <dekimsey@ufl.edu>
2526
derek-austin <derek.austin35@mailinator.com>
@@ -35,6 +36,7 @@ Ian Sparks <isparks@mdsol.com>
3536
itxaka <itxakaserrano@gmail.com>
3637
Ivica Arsov <ivica.arsov@sculpteo.com>
3738
James (d0c_s4vage) Johnson <james.johnson@exodusintel.com>
39+
Jamie Bliss <astronouth7303@gmail.com>
3840
James E. Flemer <james.flemer@ndpgroup.com>
3941
James Johnson <d0c.s4vage@gmail.com>
4042
Jason Antman <jason@jasonantman.com>
@@ -50,6 +52,7 @@ Michal Galet <michal.galet@gmail.com>
5052
Mikhail Lopotkov <ms.lopotkov@tensor.ru>
5153
Missionrulz <missionrulz@gmail.com>
5254
Mond WAN <mondwan@users.noreply.github.com>
55+
Nathan Giesbrecht <NathanGiesbrecht@users.noreply.github.com>
5356
pa4373 <pa4373@gmail.com>
5457
Patrick Miller <patrick@velocitywebworks.com>
5558
Peng Xiao <xiaoquwl@gmail.com>

‎ChangeLog.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
ChangeLog
22
=========
33

4+
Version0.21.2_ - 2017-06-11
5+
----------------------------
6+
7+
* Install doc: use sudo for system commands
8+
* [v4] Make MR work properly
9+
* Remove extra_attrs argument from _raw_list
10+
* [v4] Make project issues work properly
11+
* Fix urlencode() usage (python 2/3) (#268)
12+
* Fixed spelling mistake (#269)
13+
* Add new event types to ProjectHook
14+
415
Version0.21.1_ - 2017-05-25
516
----------------------------
617

@@ -423,6 +434,7 @@ Version 0.1 - 2013-07-08
423434

424435
* Initial release
425436

437+
.. _0.21.2:https://github.com/python-gitlab/python-gitlab/compare/0.21.1...0.21.2
426438
.. _0.21.1:https://github.com/python-gitlab/python-gitlab/compare/0.21...0.21.1
427439
.. _0.21:https://github.com/python-gitlab/python-gitlab/compare/0.20...0.21
428440
.. _0.20:https://github.com/python-gitlab/python-gitlab/compare/0.19...0.20

‎docs/cli.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ The configuration file uses the ``INI`` format. It contains at least a
4949
timeout = 1
5050
5151
The ``default`` option of the ``[global]`` section defines the GitLab server to
52-
use if no server isexplitly specified with the ``--gitlab`` CLI option.
52+
use if no server isexplicitly specified with the ``--gitlab`` CLI option.
5353

54-
The ``[global]`` section also defines the values for the defaultconnexion
54+
The ``[global]`` section also defines the values for the defaultconnection
5555
parameters. You can override the values in each GitLab server section.
5656

5757
..list-table::Global options

‎gitlab/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
fromgitlab.v3.objectsimport*# noqa
3535

3636
__title__='python-gitlab'
37-
__version__='0.21.1'
37+
__version__='0.21.2'
3838
__author__='Gauvain Pocentek'
3939
__email__='gauvain@pocentek.net'
4040
__license__='LGPL3'
@@ -70,7 +70,7 @@ class Gitlab(object):
7070

7171
def__init__(self,url,private_token=None,email=None,password=None,
7272
ssl_verify=True,http_username=None,http_password=None,
73-
timeout=None,api_version='3'):
73+
timeout=None,api_version='3',session=None):
7474

7575
self._api_version=str(api_version)
7676
self._url='%s/api/v%s'% (url,api_version)
@@ -89,7 +89,7 @@ def __init__(self, url, private_token=None, email=None, password=None,
8989
self.http_password=http_password
9090

9191
#: Create a session object for requests
92-
self.session=requests.Session()
92+
self.session=sessionorrequests.Session()
9393

9494
objects=importlib.import_module('gitlab.v%s.objects'%
9595
self._api_version)

‎tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
minversion = 1.6
33
skipsdist = True
4-
envlist = py35,py34,py27,pep8
4+
envlist =py36,py35,py34,py27,pep8
55

66
[testenv]
77
setenv =VIRTUAL_ENV={envdir}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp