~nacc/git-ubuntu:sru-series-versioning

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 03d8dd181f7e14cf1204ef435d244b8d607f08be

Robie Basak: Pending requested 2017-08-02

Diff: 557 lines (+203/-91)

8 files modified

bin/snap-git-ubuntu (+1/-0)
bin/snap-import-cron (+1/-0)
gitubuntu/git_repository.py (+0/-12)
gitubuntu/importer.py (+11/-11)
gitubuntu/importlocal.py (+2/-1)
gitubuntu/lint.py (+8/-10)
gitubuntu/merge.py (+2/-1)
gitubuntu/versioning.py (+178/-56)

api

Superseded for merging into git-ubuntu:master

Robie Basak: Needs Fixing on 2017-07-27

Diff: 231 lines (+86/-36)

1 file modified

gitubuntu/versioning.py (+86/-36)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

03d8dd1... by Nish Aravamudan on 2017-08-02

versioning: rename test_next_sru_version -> test__next_sru_version

That reflects the actual tested function is _next_sru_version.

0987b93... by Nish Aravamudan on 2017-08-02

git ubuntu lint: rename functions to clarify string parameter and return types

2ce8291... by Nish Aravamudan on 2017-08-02

gitubuntu/versioning: rename next_{sru,development}_version -> next_{sru,development}_version_string

Following our new convention, this makes it clearer what the return type is.

99d2638... by Nish Aravamudan on 2017-07-26

versioning: add support for SRU series in the versioning logic

This partially reverts commit 151c31bbbc12b74f5aaff09bb57d85baf341d959.

This changes the versioned parts into a namedtuple and updates the unit
tests accordingly (purely passing the correct type). It also clarifies
when a suffix is being manipulated and when an entire version string is
being manipulated.

With this change, the unit tests now all pass in versioning.py.

44f9732... by Nish Aravamudan on 2017-07-28

versioning: rename before/after lists to befores/afters

This helps clarify they are iterables.

f137ff7... by Nish Aravamudan on 2017-07-28

versioning: add docstring, clarify function parameters and variables

The variable names now reflect their type, as it can be quite confusing.

b501180... by Nish Aravamudan on 2017-07-28

versioning: convert next_development_version to take a string version

The notion of Version objects can be fully encapsulated in the
versioning module.

9c31f7d... by Nish Aravamudan on 2017-07-28

versioning: define exposed API with __all__

193bcb6... by Nish Aravamudan on 2017-07-26

versioning: add more unit tests for SRU policies

1e8052e... by Nish Aravamudan on 2017-07-28

versioning: move GitUbuntuRepository.version_compare

version_compare was a classmethod of GitUbuntuRepository because there
wasn't a better place for it. Now that we have a 'versioning' module, it
makes sense for version comparison to also live there. Indicate it is an
exposed API, as well.

Add some simple unit tests, as well.