Launchpad itself

Merge ~twom/launchpad:concrete-oci-projects into launchpad:master

Proposed by Tom Wardill on 2019-11-28

Status:	Merged
Approved by:	Tom Wardill on 2020-02-12
Approved revision:	c5e1d572e1ee61ffa33d73abb73cc87b0b67958a
Merge reported by:	Otto Co-Pilot
Merged at revision:	not available
Proposed branch:	~twom/launchpad:concrete-oci-projects
Merge into:	launchpad:master
Prerequisite:	~twom/launchpad:oci-gitrepository
Diff against target:	1603 lines (+1329/-12) 24 files modified lib/lp/_schema_circular_imports.py (+7/-0) lib/lp/app/validators/path.py (+34/-0) lib/lp/app/validators/tests/test_path.py (+51/-0) lib/lp/buildmaster/enums.py (+6/-0) lib/lp/code/model/tests/test_gitlookup.py (+3/-3) lib/lp/configure.zcml (+1/-0) lib/lp/oci/__init__.py (+0/-0) lib/lp/oci/configure.zcml (+59/-0) lib/lp/oci/interfaces/__init__.py (+0/-0) lib/lp/oci/interfaces/ocirecipe.py (+242/-0) lib/lp/oci/interfaces/ocirecipebuild.py (+63/-0) lib/lp/oci/model/__init__.py (+0/-0) lib/lp/oci/model/ocirecipe.py (+295/-0) lib/lp/oci/model/ocirecipebuild.py (+194/-0) lib/lp/oci/tests/__init__.py (+0/-0) lib/lp/oci/tests/test_ocirecipe.py (+208/-0) lib/lp/registry/interfaces/ociprojectseries.py (+1/-1) lib/lp/registry/model/ociproject.py (+2/-2) lib/lp/registry/model/ociprojectseries.py (+4/-4) lib/lp/registry/personmerge.py (+22/-0) lib/lp/registry/tests/test_ociprojectseries.py (+1/-1) lib/lp/registry/tests/test_personmerge.py (+40/-0) lib/lp/security.py (+41/-1) lib/lp/testing/factory.py (+55/-0)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Colin Watson (community)		2019-11-28	Approve on 2020-02-12
Review via email: mp+376132@code.staging.launchpad.net

This proposal supersedes a proposal from 2019-11-28.

Commit message

OCIRecipe and skeleton of dependent models

Revision history for this message

Colin Watson (cjwatson) on 2019-11-28:

Revision history for this message

Colin Watson (cjwatson) wrote on 2019-12-03:

Looks OK so far - just a few relatively minor comments.

review: Approve

Revision history for this message

Colin Watson (cjwatson) wrote on 2020-02-07:

Generally good, though I have a bunch more comments that I'd like to see fixed before this lands.

It's probably obvious, but note that this can't land until the DB patch has been deployed and then merged into master.

review: Approve

Revision history for this message

Colin Watson (cjwatson) wrote on 2020-02-08:

The DB patch has been deployed and I just merged it into master. However, before I forget, please note that you'll need to merge master (or rebase on it) and then implement personmerge properly for OCIRecipe.owner to replace the temporary stub I added for it. Compare https://git.launchpad.net/launchpad/commit?id=454dc1a00d36f984c7f0eb759f38df0fca0361df.