launchpad:master

Branch merges

Propose for merging

55 branches proposed for merging into this one.

Merged into launchpad:db-devel

Simone Pelosi: Approve on 2023-09-26

Diff: 7443 lines (+1371/-1501)

163 files modified

.pre-commit-config.yaml (+5/-2)
charm/launchpad-ppa-publisher/charmcraft.yaml (+1/-0)
charm/launchpad-ppa-uploader/charmcraft.yaml (+1/-0)
cronscripts/parse-librarian-apache-access-logs.py (+6/-5)
database/replication/Makefile (+27/-18)
database/schema/security.cfg (+3/-3)
dev/null (+0/-14)
doc/reference/python.rst (+1/-16)
lib/lp/answers/browser/questiontarget.py (+1/-1)
lib/lp/answers/interfaces/question.py (+2/-2)
lib/lp/answers/interfaces/questionmessage.py (+1/-9)
lib/lp/app/doc/batch-navigation.rst (+1/-2)
lib/lp/app/validators/README.txt (+2/-4)
lib/lp/archivepublisher/tests/test_sync_signingkeys.py (+4/-1)
lib/lp/archiveuploader/tests/test_nascentupload_documentation.py (+2/-1)
lib/lp/archiveuploader/uploadprocessor.py (+2/-4)
lib/lp/blueprints/doc/specification.rst (+5/-4)
lib/lp/blueprints/model/specificationworkitem.py (+6/-3)
lib/lp/blueprints/model/sprint.py (+1/-6)
lib/lp/blueprints/model/sprintattendance.py (+5/-4)
lib/lp/blueprints/vocabularies/specificationdependency.py (+1/-1)
lib/lp/bugs/browser/tests/buglinktarget-views.rst (+1/-1)
lib/lp/bugs/model/bug.py (+2/-2)
lib/lp/bugs/model/bugtask.py (+1/-1)
lib/lp/bugs/model/bugtasksearch.py (+34/-38)
lib/lp/bugs/stories/bugs/xx-bug-text-pages.rst (+1/-1)
lib/lp/bugs/stories/webservice/xx-bug.rst (+45/-0)
lib/lp/buildmaster/interfaces/processor.py (+1/-1)
lib/lp/charms/model/charmrecipebuild.py (+2/-2)
lib/lp/code/doc/codeimport-machine.rst (+1/-1)
lib/lp/code/interfaces/branch.py (+1/-1)
lib/lp/code/mail/tests/test_codehandler.py (+1/-1)
lib/lp/code/model/cibuild.py (+1/-1)
lib/lp/code/model/sourcepackagerecipe.py (+3/-3)
lib/lp/code/model/sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/model/tests/test_codereviewkarma.py (+1/-1)
lib/lp/code/model/tests/test_revisionauthor.py (+6/-6)
lib/lp/code/xmlrpc/tests/test_git.py (+14/-25)
lib/lp/codehosting/tests/test_acceptance.py (+7/-5)
lib/lp/oci/model/ocirecipebuild.py (+3/-3)
lib/lp/registry/browser/person.py (+5/-6)
lib/lp/registry/browser/tests/test_person_webservice.py (+16/-0)
lib/lp/registry/doc/person-account.rst (+5/-3)
lib/lp/registry/doc/person-merge.rst (+4/-0)
lib/lp/registry/doc/pillar.rst (+7/-3)
lib/lp/registry/doc/vocabularies.rst (+0/-1)
lib/lp/registry/interfaces/person.py (+7/-6)
lib/lp/registry/model/distribution.py (+12/-15)
lib/lp/registry/model/distributionsourcepackage.py (+2/-2)
lib/lp/registry/model/distroseries.py (+1/-1)
lib/lp/registry/model/distroseriesdifference.py (+5/-6)
lib/lp/registry/model/mailinglist.py (+1/-2)
lib/lp/registry/model/person.py (+180/-142)
lib/lp/registry/model/pillar.py (+20/-15)
lib/lp/registry/model/productrelease.py (+1/-1)
lib/lp/registry/model/sharingjob.py (+3/-3)
lib/lp/registry/model/teammembership.py (+14/-1)
lib/lp/registry/personmerge.py (+1/-2)
lib/lp/registry/scripts/closeaccount.py (+1/-1)
lib/lp/registry/scripts/populate_distroseriesdiff.py (+1/-1)
lib/lp/registry/security.py (+19/-1)
lib/lp/registry/stories/distributionmirror/xx-reassign-distributionmirror.rst (+5/-2)
lib/lp/registry/stories/person/xx-approve-members.rst (+3/-1)
lib/lp/registry/stories/productrelease/xx-productrelease-basics.rst (+1/-1)
lib/lp/registry/stories/productrelease/xx-productrelease-view.rst (+5/-2)
lib/lp/registry/stories/teammembership/xx-add-member.rst (+5/-3)
lib/lp/registry/stories/teammembership/xx-teammembership.rst (+5/-4)
lib/lp/registry/tests/test_person.py (+6/-6)
lib/lp/registry/tests/test_teammembership.py (+1/-1)
lib/lp/registry/vocabularies.py (+18/-20)
lib/lp/scripts/garbo.py (+1/-1)
lib/lp/scripts/harness.py (+1/-1)
lib/lp/services/apachelogparser/model/parsedapachelog.py (+6/-3)
lib/lp/services/auth/tests/test_model.py (+57/-24)
lib/lp/services/authserver/tests/test_authserver.py (+2/-2)
lib/lp/services/authserver/xmlrpc.py (+2/-2)
lib/lp/services/database/doc/security-proxies.rst (+12/-10)
lib/lp/services/database/doc/storm-security-proxies.rst (+2/-2)
lib/lp/services/database/interfaces.py (+0/-11)
lib/lp/services/database/multitablecopy.py (+5/-5)
lib/lp/services/database/postgresql.py (+3/-3)
lib/lp/services/database/sqlbase.py (+40/-223)
lib/lp/services/database/sqlobject/__init__.py (+1/-26)
lib/lp/services/database/tests/test_transaction_decorators.py (+3/-1)
lib/lp/services/features/model.py (+1/-2)
lib/lp/services/librarian/client.py (+4/-8)
lib/lp/services/librarian/model.py (+81/-69)
lib/lp/services/librarian/tests/test_client.py (+6/-5)
lib/lp/services/librarianserver/db.py (+19/-12)
lib/lp/services/librarianserver/librariangc.py (+3/-3)
lib/lp/services/librarianserver/storage.py (+4/-3)
lib/lp/services/librarianserver/testing/fake.py (+6/-3)
lib/lp/services/librarianserver/testing/server.py (+2/-1)
lib/lp/services/librarianserver/tests/test_db.py (+9/-8)
lib/lp/services/librarianserver/tests/test_gc.py (+78/-69)
lib/lp/services/librarianserver/tests/test_storage.py (+8/-3)
lib/lp/services/librarianserver/tests/test_storage_db.py (+10/-4)
lib/lp/services/librarianserver/tests/test_web.py (+1/-1)
lib/lp/services/librarianserver/web.py (+1/-1)
lib/lp/services/messages/interfaces/message.py (+8/-2)
lib/lp/services/messages/model/message.py (+1/-2)
lib/lp/services/openid/model/openididentifier.py (+6/-3)
lib/lp/services/session/model.py (+5/-4)
lib/lp/services/statistics/tests/test_update_stats.py (+1/-1)
lib/lp/services/tarfile_helpers.py (+0/-10)
lib/lp/services/verification/doc/logintoken.rst (+6/-5)
lib/lp/services/webapp/configure.zcml (+0/-8)
lib/lp/services/webapp/database.zcml (+0/-3)
lib/lp/services/webapp/marshallers.py (+2/-3)
lib/lp/services/webapp/snapshot.py (+4/-5)
lib/lp/services/webapp/tests/test_servers.py (+26/-14)
lib/lp/services/webapp/vocabulary.py (+1/-164)
lib/lp/services/webservice/configure.zcml (+0/-14)
lib/lp/services/webservice/doc/webservice-marshallers.rst (+7/-7)
lib/lp/services/worlddata/interfaces/language.py (+2/-8)
lib/lp/snappy/browser/snapbase.py (+2/-4)
lib/lp/snappy/model/snap.py (+1/-1)
lib/lp/snappy/model/snapbuild.py (+3/-3)
lib/lp/snappy/templates/snap-new.pt (+4/-4)
lib/lp/soyuz/browser/archive.py (+2/-4)
lib/lp/soyuz/browser/queue.py (+2/-2)
lib/lp/soyuz/browser/tests/distroseriesqueue-views.rst (+2/-1)
lib/lp/soyuz/doc/gina-multiple-arch.rst (+2/-2)
lib/lp/soyuz/doc/gina.rst (+8/-5)
lib/lp/soyuz/doc/package-diff.rst (+3/-2)
lib/lp/soyuz/doc/soyuz-set-of-uploads.rst (+2/-2)
lib/lp/soyuz/model/archive.py (+153/-117)
lib/lp/soyuz/model/archivefile.py (+2/-2)
lib/lp/soyuz/model/archivesubscriber.py (+1/-1)
lib/lp/soyuz/model/binarypackagebuild.py (+4/-4)
lib/lp/soyuz/model/distributionsourcepackagerelease.py (+2/-2)
lib/lp/soyuz/model/initializedistroseriesjob.py (+3/-1)
lib/lp/soyuz/model/livefsbuild.py (+2/-2)
lib/lp/soyuz/model/packagecloner.py (+8/-8)
lib/lp/soyuz/model/packagediff.py (+1/-1)
lib/lp/soyuz/model/publishing.py (+9/-13)
lib/lp/soyuz/model/queue.py (+2/-2)
lib/lp/soyuz/model/sourcepackagerelease.py (+1/-1)
lib/lp/soyuz/scripts/gina/README (+1/-1)
lib/lp/soyuz/scripts/initialize_distroseries.py (+2/-2)
lib/lp/soyuz/scripts/packagecopier.py (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+14/-15)
lib/lp/soyuz/tests/test_initializedistroseriesjob.py (+48/-25)
lib/lp/soyuz/tests/test_packagediff.py (+1/-1)
lib/lp/soyuz/vocabularies.py (+16/-19)
lib/lp/testing/__init__.py (+6/-3)
lib/lp/testing/factory.py (+2/-0)
lib/lp/testing/html5browser.py (+1/-1)
lib/lp/testing/layers.py (+28/-2)
lib/lp/testing/tests/test_html5browser.py (+7/-7)
lib/lp/translations/doc/rosetta-karma.rst (+2/-2)
lib/lp/translations/doc/rosetta-translation.rst (+4/-4)
lib/lp/translations/doc/translationmessage-destroy.rst (+1/-2)
lib/lp/translations/model/distroserieslanguage.py (+1/-1)
lib/lp/translations/model/poexportrequest.py (+1/-1)
lib/lp/translations/model/pofile.py (+2/-2)
lib/lp/translations/model/potemplate.py (+1/-1)
lib/lp/translations/model/translationgroup.py (+5/-5)
lib/lp/translations/scripts/fix_plural_forms.py (+2/-5)
lib/lp/translations/scripts/tests/test_remove_translations.py (+4/-4)
scripts/librarian-report.py (+3/-3)
utilities/make-dummy-hosted-branches (+3/-3)
utilities/snakefood/Makefile (+2/-2)

api

Merged into launchpad:db-devel

Colin Watson (community): Approve on 2021-10-21

Diff: 171 lines (+21/-45)

6 files modified

database/sampledata/current-dev.sql (+1/-1)
database/sampledata/current.sql (+1/-1)
lib/lp/registry/model/codeofconduct.py (+1/-1)
lib/lp/registry/tests/test_codeofconduct.py (+18/-0)
lib/lp/scripts/garbo.py (+0/-25)
lib/lp/scripts/tests/test_garbo.py (+0/-17)

api

Merged into launchpad:db-devel

Colin Watson (community): Approve on 2021-05-19

Diff: 70 lines (+36/-1)

3 files modified

lib/lp/code/model/branch.py (+3/-1)
lib/lp/snappy/browser/snap.py (+4/-0)
lib/lp/snappy/browser/tests/test_snap.py (+29/-0)

api

Merged into launchpad:db-devel

Colin Watson (community): Approve on 2021-05-07

Diff: 1621 lines (+273/-801)

18 files modified

dev/null (+0/-139)
lib/lp/archivepublisher/publishing.py (+3/-28)
lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py (+11/-206)
lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py (+1/-351)
lib/lp/archivepublisher/tests/test_publisher.py (+0/-39)
lib/lp/oci/model/ocirecipebuildjob.py (+8/-4)
lib/lp/oci/tests/test_ocirecipebuildjob.py (+5/-10)
lib/lp/registry/browser/distribution.py (+0/-3)
lib/lp/registry/interfaces/distribution.py (+42/-1)
lib/lp/registry/model/distribution.py (+28/-0)
lib/lp/registry/scripts/closeaccount.py (+3/-6)
lib/lp/registry/tests/test_distribution.py (+91/-1)
lib/lp/registry/tests/test_personmerge.py (+2/-2)
lib/lp/services/scripts/base.py (+0/-4)
lib/lp/snappy/model/snap.py (+0/-7)
lib/lp/soyuz/scripts/expire_archive_files.py (+3/-0)
lib/lp/testing/layers.py (+18/-0)
utilities/manage-celery-workers.sh (+58/-0)

api

Merged into launchpad:db-devel

Colin Watson (community): Approve on 2020-09-21

Diff: 1786 lines (+576/-268)

41 files modified

lib/lp/archivepublisher/archivegpgsigningkey.py (+55/-23)
lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py (+105/-3)
lib/lp/blueprints/browser/sprint.py (+3/-2)
lib/lp/blueprints/browser/tests/test_views.py (+2/-1)
lib/lp/blueprints/model/specification.py (+14/-13)
lib/lp/blueprints/model/sprint.py (+96/-70)
lib/lp/blueprints/model/sprintspecification.py (+39/-23)
lib/lp/blueprints/vocabularies/sprint.py (+5/-9)
lib/lp/code/mail/tests/test_codehandler.py (+2/-0)
lib/lp/code/mail/tests/test_codereviewcomment.py (+1/-1)
lib/lp/code/model/branchcollection.py (+2/-2)
lib/lp/code/model/branchmergeproposal.py (+28/-15)
lib/lp/code/model/codereviewcomment.py (+30/-14)
lib/lp/code/model/codereviewvote.py (+36/-20)
lib/lp/code/model/gitcollection.py (+2/-2)
lib/lp/code/model/tests/test_branch.py (+4/-4)
lib/lp/code/model/tests/test_gitrepository.py (+4/-4)
lib/lp/code/stories/webservice/xx-branchmergeproposal.txt (+2/-2)
lib/lp/codehosting/puller/tests/test_scheduler.py (+1/-1)
lib/lp/registry/model/projectgroup.py (+13/-10)
lib/lp/services/database/policy.py (+1/-1)
lib/lp/services/gpg/handler.py (+3/-7)
lib/lp/services/gpg/interfaces.py (+13/-2)
lib/lp/services/librarianserver/tests/test_storage_db.py (+1/-1)
lib/lp/services/mail/helpers.py (+11/-3)
lib/lp/services/signing/tests/helpers.py (+2/-2)
lib/lp/services/worlddata/vocabularies.py (+4/-1)
lib/lp/soyuz/adapters/tests/test_archivedependencies.py (+1/-1)
lib/lp/soyuz/configure.zcml (+0/-1)
lib/lp/soyuz/interfaces/archive.py (+2/-0)
lib/lp/soyuz/model/archive.py (+7/-6)
lib/lp/soyuz/scripts/ppakeygenerator.py (+3/-3)
lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py (+5/-5)
lib/lp/soyuz/stories/soyuz/xx-person-packages.txt (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+1/-1)
lib/lp/testing/factory.py (+4/-4)
lib/lp/translations/pottery/tests/test_detect_intltool.py (+14/-0)
scripts/rosetta/pottery-generate-intltool.py (+56/-0)
utilities/launchpad-database-setup (+0/-7)
utilities/sourcedeps.cache (+2/-2)
utilities/sourcedeps.conf (+1/-1)

api

Merged into launchpad:db-devel at revision c8098b989a584ec2ecc82ee03ad4b5e0f4b9f613

Colin Watson (community): Approve on 2019-10-03

Diff: 85 lines (+10/-11)

6 files modified

doc/_static/.gitignore (+0/-0)
doc/_templates/.gitignore (+0/-0)
lib/lp/answers/configure.zcml (+0/-2)
lib/lp/app/tests/test_help.py (+0/-4)
lib/lp/services/mail/tests/test_stub.py (+8/-5)
scripts/update-version-info.sh (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

bdc718f... by Guruprasad on 2024-05-24

Propagate only the 4096R key from the default PPA with a 1024R and a 4096R signing key

New, non-default PPAs need not have the legacy 1024-bit RSA signing key.

Merged from https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/465868

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

c70e110... by Guruprasad on 2024-05-09

Propagate only the 4096R key from the default PPA with a 1024R and a 4096R signing key

New, non-default PPAs need not have the legacy 1024-bit RSA signing key.

0e1f616... by Ines Almeida on 2024-05-08

charm: update appserver logrotate from daily to hourly

Currently log files for this service can get quite heavy (in the realm of 10 Gb) which makes it impossible to live view the latest logs of a unit. Taking into account that we run 4 appserver units, debuging an issue can lead to several minutes to download the daily log files, and the launchpad-bastion disk to get unnecessarily full.
In this change, we are rotating the logs hourly, while keeping the same amount of days worth of logs on disk. This will lead to lighter log files, and less space for logs used.

Merged from https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/464017

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

0bc8cef... by Guruprasad on 2024-05-08

Fix exception when the default PPA has no signing key or has a secure one already

This should allow the PPA key updater script to generate replacement
keys for the 5 remaining PPAs that are in this scenario.

Merged from https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/465757

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

ffefef7... by Guruprasad on 2024-05-08

Fix exception when the default PPA has no signing key or has a secure one already

This should allow the PPA key updater script to generate replacement
keys for the 5 remaining PPAs that are in this scenario.

f33e652... by Ines Almeida on 2024-05-06

Bump pkginfo==1.10.0

Merged from https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/465595

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

1416109... by Ines Almeida on 2024-05-06

Bump pkginfo==1.10.0

e28e84d... by Jürgen Gmach on 2024-05-06

Update link to our documentation in rocketfuel-setup

Merged from https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/465569

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

93ea335... by Guruprasad on 2024-05-06

charm/launchpad-codehosting: Fix a double slash in an apache2 rewrite rule

Merged from https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/465505

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

2295057... by Jürgen Gmach on 2024-05-06

Update link to our documentation in rocketfuel-setup