Skip to content

Commit 1ce40a3

Browse files
d0c-s4vaged0c-s4vage
committed
Merge branch 'master' into feature-project_uploads-56
2 parents 48b028c + 0e0d4ae commit 1ce40a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+8200
-2090
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ env:
1515
- TOX_ENV=py27
1616
- TOX_ENV=pep8
1717
- TOX_ENV=docs
18-
- TOX_ENV=py_func
19-
- TOX_ENV=cli_func
18+
- TOX_ENV=py_func_v3
19+
- TOX_ENV=py_func_v4
20+
- TOX_ENV=cli_func_v3
21+
- TOX_ENV=cli_func_v4
2022
install:
2123
- pip install tox
2224
script:

‎AUTHORS‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Contributors
88
------------
99

1010
Adam Reid <areid@navtech.aero>
11+
Alexander Skiba <mail@ghostlyrics.net>
1112
Alex Widener <alexwidener@users.noreply.github.com>
1213
Amar Sood (tekacs) <mail@tekacs.com>
1314
Andjelko Horvat <ahorvat@reflected.net>
@@ -19,29 +20,39 @@ Asher256@users.noreply.github.com <Asher256>
1920
Christian <cgumpert@users.noreply.github.com>
2021
Christian Wenk <christian.wenk@omicronenergy.com>
2122
Colin D Bennett <colin.bennett@harman.com>
23+
Cosimo Lupo <cosimo.lupo@daltonmaag.com>
2224
Crestez Dan Leonard <lcrestez@ixiacom.com>
2325
Daniel Kimsey <dekimsey@ufl.edu>
2426
derek-austin <derek.austin35@mailinator.com>
2527
Diego Giovane Pasqualin <dpasqualin@c3sl.ufpr.br>
28+
Dmytro Litvinov <litvinov.do.it@gmail.com>
2629
Erik Weatherwax <erik.weatherwax@xls.xerox.com>
2730
fgouteroux <francois.gouteroux@d2-si.eu>
2831
Greg Allen <GregoryEAllen@users.noreply.github.com>
32+
Guillaume Delacour <gui@iroqwa.org>
2933
Guyzmo <guyzmo+github@m0g.net>
3034
hakkeroid <hakkeroid@users.noreply.github.com>
35+
Ian Sparks <isparks@mdsol.com>
3136
itxaka <itxakaserrano@gmail.com>
3237
Ivica Arsov <ivica.arsov@sculpteo.com>
3338
James (d0c_s4vage) Johnson <james.johnson@exodusintel.com>
39+
Jamie Bliss <astronouth7303@gmail.com>
40+
James E. Flemer <james.flemer@ndpgroup.com>
3441
James Johnson <d0c.s4vage@gmail.com>
3542
Jason Antman <jason@jasonantman.com>
43+
Johan Brandhorst <johan@cognitivelogic.com>
3644
Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
3745
Koen Smets <koen.smets@gmail.com>
3846
Kris Gambirazzi <Kris@sitehost.co.nz>
3947
Mart Sõmermaa <mart.somermaa@cgi.com>
4048
massimone88 <stefano.mandruzzato@gmail.com>
49+
Matej Zerovnik <matej@zunaj.si>
4150
Matt Odden <locke105@gmail.com>
4251
Michal Galet <michal.galet@gmail.com>
4352
Mikhail Lopotkov <ms.lopotkov@tensor.ru>
4453
Missionrulz <missionrulz@gmail.com>
54+
Mond WAN <mondwan@users.noreply.github.com>
55+
Nathan Giesbrecht <NathanGiesbrecht@users.noreply.github.com>
4556
pa4373 <pa4373@gmail.com>
4657
Patrick Miller <patrick@velocitywebworks.com>
4758
Peng Xiao <xiaoquwl@gmail.com>
@@ -51,7 +62,10 @@ Philipp Busch <philipp.busch@momox.biz>
5162
Rafael Eyng <rafaeleyng@gmail.com>
5263
Richard Hansen <rhansen@rhansen.org>
5364
samcday <sam.c.day@gmail.com>
65+
savenger <github@smahmood.de>
5466
Stefan K. Dunkler <stefan.dun@gmail.com>
5567
Stefan Klug <klug.stefan@gmx.de>
5668
Stefano Mandruzzato <stefano.mandruzzato@gmail.com>
69+
Tim Neumann <mail@timnn.me>
5770
Will Starms <vilhelmen@gmail.com>
71+
Yosi Zelensky <yosyos04@gmail.com>

‎ChangeLog.rst‎

Lines changed: 107 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,60 @@
1-
python-gitlab Changelog
2-
=======================
1+
ChangeLog
2+
=========
33

4-
Version 0.19_: - 2017-02-21
4+
Version 0.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+
15+
Version 0.21.1_ - 2017-05-25
16+
----------------------------
17+
18+
* Fix the manager name for jobs in the Project class
19+
* Fix the docs
20+
21+
Version 0.21_ - 2017-05-24
22+
--------------------------
23+
24+
* Add time_stats to ProjectMergeRequest
25+
* Update User options for creation and update (#246)
26+
* Add milestone.merge_requests() API
27+
* Fix docs typo (s/correspnding/corresponding/)
28+
* Support milestone start date (#251)
29+
* Add support for priority attribute in labels (#256)
30+
* Add support for nested groups (#257)
31+
* Make GroupProjectManager a subclass of ProjectManager (#255)
32+
* Available services: return a list instead of JSON (#258)
33+
* MR: add support for time tracking features (#248)
34+
* Fixed repository_tree and repository_blob path encoding (#265)
35+
* Add 'search' attribute to projects.list()
36+
* Initial gitlab API v4 support
37+
* Reorganise the code to handle v3 and v4 objects
38+
* Allow 202 as delete return code
39+
* Deprecate parameter related methods in gitlab.Gitlab
40+
41+
Version 0.20_ - 2017-03-25
42+
---------------------------
43+
44+
* Add time tracking support (#222)
45+
* Improve changelog (#229, #230)
46+
* Make sure that manager objects are never overwritten (#209)
47+
* Include chanlog and release notes in docs
48+
* Add DeployKey{,Manager} classes (#212)
49+
* Add support for merge request notes deletion (#227)
50+
* Properly handle extra args when listing with all=True (#233)
51+
* Implement pipeline creation API (#237)
52+
* Fix spent_time methods
53+
* Add 'delete source branch' option when creating MR (#241)
54+
* Provide API wrapper for cherry picking commits (#236)
55+
* Stop listing if recursion limit is hit (#234)
56+
57+
Version 0.19_ - 2017-02-21
558
---------------------------
659

760
* Update project.archive() docs
@@ -17,7 +70,7 @@ Version 0.19_: - 2017-02-21
1770
* Handle settings.domain_whitelist, partly
1871
* {Project,Group}Member: support expires_at attribute
1972

20-
Version 0.18_: - 2016-12-27
73+
Version 0.18_ - 2016-12-27
2174
---------------------------
2275

2376
* Fix JIRA service editing for GitLab 8.14+
@@ -32,7 +85,7 @@ Version 0.18_: - 2016-12-27
3285
* Update known attributes for projects
3386
* sudo: always use strings
3487

35-
Version 0.17_: - 2016-12-02
88+
Version 0.17_ - 2016-12-02
3689
---------------------------
3790

3891
* README: add badges for pypi and RTD
@@ -67,7 +120,7 @@ Version 0.17_: - 2016-12-02
67120
* Rework requests arguments (support latest requests release)
68121
* Fix `should_remove_source_branch`
69122

70-
Version 0.16_: - 2016-10-16
123+
Version 0.16_ - 2016-10-16
71124
---------------------------
72125

73126
* Add the ability to fork to a specific namespace
@@ -84,14 +137,14 @@ Version 0.16_: - 2016-10-16
84137
* Add ProjectBuild.erase()
85138
* Implement ProjectBuild.play()
86139

87-
Version 0.15.1_: - 2016-10-16
140+
Version 0.15.1_ - 2016-10-16
88141
-----------------------------
89142

90143
* docs: improve the pagination section
91144
* Fix and test pagination
92145
* 'path' is an existing gitlab attr, don't use it as method argument
93146

94-
Version 0.15_: - 2016-08-28
147+
Version 0.15_ - 2016-08-28
95148
---------------------------
96149

97150
* Add a basic HTTP debug method
@@ -112,7 +165,7 @@ Version 0.15_: - 2016-08-28
112165
* Add support for access requests
113166
* Add support for project deployments
114167

115-
Version 0.14_: - 2016-08-07
168+
Version 0.14_ - 2016-08-07
116169
---------------------------
117170

118171
* Remove 'next_url' from kwargs before passing it to the cls constructor.
@@ -164,7 +217,7 @@ Version 0.14_: - 2016-08-07
164217
* MR (un)subscribe: don't fail if state doesn't change
165218
* MR merge(): update the object
166219

167-
Version 0.13_: - 2016-05-16
220+
Version 0.13_ - 2016-05-16
168221
---------------------------
169222

170223
* Add support for MergeRequest validation
@@ -191,7 +244,7 @@ Version 0.13_: - 2016-05-16
191244
* Implement list/get licenses
192245
* Manage optional parameters for list() and get()
193246

194-
Version 0.12.2_: - 2016-03-19
247+
Version 0.12.2_ - 2016-03-19
195248
-----------------------------
196249

197250
* Add new `ProjectHook` attributes
@@ -211,12 +264,12 @@ Version 0.12.2_: - 2016-03-19
211264
* Fix the 'invalid syntax' error on Python 3.2
212265
* Gitlab.update(): use the proper attributes if defined
213266

214-
Version 0.12.1_: - 2016-02-03
267+
Version 0.12.1_ - 2016-02-03
215268
-----------------------------
216269

217270
* Fix a broken upload to pypi
218271

219-
Version 0.12_: - 2016-02-03
272+
Version 0.12_ - 2016-02-03
220273
---------------------------
221274

222275
* Improve documentation
@@ -240,15 +293,15 @@ Version 0.12_: - 2016-02-03
240293
* Fix Project.tree()
241294
* Add support for project builds
242295

243-
Version 0.11.1_: - 2016-01-17
296+
Version 0.11.1_ - 2016-01-17
244297
-----------------------------
245298

246299
* Fix discovery of parents object attrs for managers
247300
* Support setting commit status
248301
* Support deletion without getting the object first
249302
* Improve the documentation
250303

251-
Version 0.11_: - 2016-01-09
304+
Version 0.11_ - 2016-01-09
252305
---------------------------
253306

254307
* functional_tests.sh: support python 2 and 3
@@ -265,7 +318,7 @@ Version 0.11_: - 2016-01-09
265318
* Deprecate the "old" Gitlab methods
266319
* Add support for groups search
267320

268-
Version 0.10_: - 2015-12-29
321+
Version 0.10_ - 2015-12-29
269322
---------------------------
270323

271324
* Implement pagination for list() (#63)
@@ -279,17 +332,17 @@ Version 0.10_: - 2015-12-29
279332
* Python 3 compatibility fixes
280333
* Add support for group members update (#73)
281334

282-
Version 0.9.2_: - 2015-07-11
335+
Version 0.9.2_ - 2015-07-11
283336
----------------------------
284337

285338
* CLI: fix the update and delete subcommands (#62)
286339

287-
Version 0.9.1_: - 2015-05-15
340+
Version 0.9.1_ - 2015-05-15
288341
----------------------------
289342

290343
* Fix the setup.py script
291344

292-
Version 0.9_: - 2015-05-15
345+
Version 0.9_ - 2015-05-15
293346
--------------------------
294347

295348
* Implement argparse libray for parsing argument on CLI
@@ -307,7 +360,7 @@ Version 0.9_: - 2015-05-15
307360
set_token
308361
* Sphinx: don't hardcode the version in conf.py
309362

310-
Version 0.8_: - 2014-10-26
363+
Version 0.8_ - 2014-10-26
311364
--------------------------
312365

313366
* Better python 2.6 and python 3 support
@@ -318,7 +371,7 @@ Version 0.8_: - 2014-10-26
318371
* Moved url attributes to separate list
319372
* Added list for delete attributes
320373

321-
Version 0.7_: - 2014-08-21
374+
Version 0.7_ - 2014-08-21
322375
--------------------------
323376

324377
* Fix license classifier in setup.py
@@ -330,15 +383,15 @@ Version 0.7_: - 2014-08-21
330383
* Support namespace/name for project id (#28)
331384
* Fix handling of boolean values (#22)
332385

333-
Version 0.6_: - 2014-01-16
386+
Version 0.6_ - 2014-01-16
334387
--------------------------
335388

336389
* IDs can be unicode (#15)
337390
* ProjectMember: constructor should not create a User object
338391
* Add support for extra parameters when listing all projects (#12)
339392
* Projects listing: explicitly define arguments for pagination
340393

341-
Version 0.5_: - 2013-12-26
394+
Version 0.5_ - 2013-12-26
342395
--------------------------
343396

344397
* Add SSH key for user
@@ -352,7 +405,7 @@ Version 0.5_: - 2013-12-26
352405
* Define new optional attributes for user creation
353406
* Provide constants for access permissions in groups
354407

355-
Version 0.4_: - 2013-09-26
408+
Version 0.4_ - 2013-09-26
356409
--------------------------
357410

358411
* Fix strings encoding (Closes #6)
@@ -361,7 +414,7 @@ Version 0.4_: - 2013-09-26
361414
* Gitlab 6.1 methods: diff, blob (commit), tree, blob (project)
362415
* Add support for Gitlab 6.1 group members
363416

364-
Version 0.3_: - 2013-08-27
417+
Version 0.3_ - 2013-08-27
365418
--------------------------
366419

367420
* Use PRIVATE-TOKEN header for passing the auth token
@@ -370,7 +423,7 @@ Version 0.3_: - 2013-08-27
370423
* Add ssl_verify option to Gitlab object. Defauls to True
371424
* Correct url for merge requests API.
372425

373-
Version 0.2_: - 2013-08-08
426+
Version 0.2_ - 2013-08-08
374427
--------------------------
375428

376429
* provide a pip requirements.txt
@@ -381,27 +434,31 @@ Version 0.1 - 2013-07-08
381434

382435
* Initial release
383436

384-
.. _0.19: https://github.com/gpocentek/python-gitlab/compare/0.18...0.19
385-
.. _0.18: https://github.com/gpocentek/python-gitlab/compare/0.17...0.18
386-
.. _0.17: https://github.com/gpocentek/python-gitlab/compare/0.16...0.17
387-
.. _0.16: https://github.com/gpocentek/python-gitlab/compare/0.15.1...0.16
388-
.. _0.15.1: https://github.com/gpocentek/python-gitlab/compare/0.15...0.15.1
389-
.. _0.15: https://github.com/gpocentek/python-gitlab/compare/0.14...0.15
390-
.. _0.14: https://github.com/gpocentek/python-gitlab/compare/0.13...0.14
391-
.. _0.13: https://github.com/gpocentek/python-gitlab/compare/0.12.2...0.13
392-
.. _0.12.2: https://github.com/gpocentek/python-gitlab/compare/0.12.1...0.12.2
393-
.. _0.12.1: https://github.com/gpocentek/python-gitlab/compare/0.12...0.12.1
394-
.. _0.12: https://github.com/gpocentek/python-gitlab/compare/0.11.1...0.12
395-
.. _0.11.1: https://github.com/gpocentek/python-gitlab/compare/0.11...0.11.1
396-
.. _0.11: https://github.com/gpocentek/python-gitlab/compare/0.10...0.11
397-
.. _0.10: https://github.com/gpocentek/python-gitlab/compare/0.9.2...0.10
398-
.. _0.9.2: https://github.com/gpocentek/python-gitlab/compare/0.9.1...0.9.2
399-
.. _0.9.1: https://github.com/gpocentek/python-gitlab/compare/0.9...0.9.1
400-
.. _0.9: https://github.com/gpocentek/python-gitlab/compare/0.8...0.9
401-
.. _0.8: https://github.com/gpocentek/python-gitlab/compare/0.7...0.8
402-
.. _0.7: https://github.com/gpocentek/python-gitlab/compare/0.6...0.7
403-
.. _0.6: https://github.com/gpocentek/python-gitlab/compare/0.5...0.6
404-
.. _0.5: https://github.com/gpocentek/python-gitlab/compare/0.4...0.5
405-
.. _0.4: https://github.com/gpocentek/python-gitlab/compare/0.3...0.4
406-
.. _0.3: https://github.com/gpocentek/python-gitlab/compare/0.2...0.3
407-
.. _0.2: https://github.com/gpocentek/python-gitlab/compare/0.1...0.2
437+
.. _0.21.2: https://github.com/python-gitlab/python-gitlab/compare/0.21.1...0.21.2
438+
.. _0.21.1: https://github.com/python-gitlab/python-gitlab/compare/0.21...0.21.1
439+
.. _0.21: https://github.com/python-gitlab/python-gitlab/compare/0.20...0.21
440+
.. _0.20: https://github.com/python-gitlab/python-gitlab/compare/0.19...0.20
441+
.. _0.19: https://github.com/python-gitlab/python-gitlab/compare/0.18...0.19
442+
.. _0.18: https://github.com/python-gitlab/python-gitlab/compare/0.17...0.18
443+
.. _0.17: https://github.com/python-gitlab/python-gitlab/compare/0.16...0.17
444+
.. _0.16: https://github.com/python-gitlab/python-gitlab/compare/0.15.1...0.16
445+
.. _0.15.1: https://github.com/python-gitlab/python-gitlab/compare/0.15...0.15.1
446+
.. _0.15: https://github.com/python-gitlab/python-gitlab/compare/0.14...0.15
447+
.. _0.14: https://github.com/python-gitlab/python-gitlab/compare/0.13...0.14
448+
.. _0.13: https://github.com/python-gitlab/python-gitlab/compare/0.12.2...0.13
449+
.. _0.12.2: https://github.com/python-gitlab/python-gitlab/compare/0.12.1...0.12.2
450+
.. _0.12.1: https://github.com/python-gitlab/python-gitlab/compare/0.12...0.12.1
451+
.. _0.12: https://github.com/python-gitlab/python-gitlab/compare/0.11.1...0.12
452+
.. _0.11.1: https://github.com/python-gitlab/python-gitlab/compare/0.11...0.11.1
453+
.. _0.11: https://github.com/python-gitlab/python-gitlab/compare/0.10...0.11
454+
.. _0.10: https://github.com/python-gitlab/python-gitlab/compare/0.9.2...0.10
455+
.. _0.9.2: https://github.com/python-gitlab/python-gitlab/compare/0.9.1...0.9.2
456+
.. _0.9.1: https://github.com/python-gitlab/python-gitlab/compare/0.9...0.9.1
457+
.. _0.9: https://github.com/python-gitlab/python-gitlab/compare/0.8...0.9
458+
.. _0.8: https://github.com/python-gitlab/python-gitlab/compare/0.7...0.8
459+
.. _0.7: https://github.com/python-gitlab/python-gitlab/compare/0.6...0.7
460+
.. _0.6: https://github.com/python-gitlab/python-gitlab/compare/0.5...0.6
461+
.. _0.5: https://github.com/python-gitlab/python-gitlab/compare/0.4...0.5
462+
.. _0.4: https://github.com/python-gitlab/python-gitlab/compare/0.3...0.4
463+
.. _0.3: https://github.com/python-gitlab/python-gitlab/compare/0.2...0.3
464+
.. _0.2: https://github.com/python-gitlab/python-gitlab/compare/0.1...0.2

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include COPYING AUTHORS ChangeLog requirements.txt test-requirements.txt rtd-requirements.txt
1+
include COPYING AUTHORS ChangeLog.rst RELEASE_NOTES.rst requirements.txt test-requirements.txt rtd-requirements.txt
22
include tox.ini .testr.conf .travis.yml
33
recursive-include tools *
44
recursive-include docs *j2 *.py *.rst api/*.rst Makefile make.bat

0 commit comments

Comments
 (0)