git-ubuntu

Merge ~lvoytek/git-ubuntu:master into git-ubuntu:master

  1. Git
  2. lp:~lvoytek/git-ubuntu
  3. master
  4. Merge into master
Proposed by Lena Voytek
Status: Merged
Approved by: Robie Basak
Approved revision: 1f999579b08e1642620a1768c4403b7bbb078cc5
Merge reported by: Robie Basak
Merged at revision: 1f999579b08e1642620a1768c4403b7bbb078cc5
Proposed branch: ~lvoytek/git-ubuntu:master
Merge into: git-ubuntu:master
Diff against target: 610 lines (+85/-85)
25 files modified
doc/SPECIFICATION (+3/-3)
gitubuntu/changelog_tests/maintainer_name_inner_space (+1/-1)
gitubuntu/changelog_tests/maintainer_name_leading_space (+1/-1)
gitubuntu/changelog_tests/maintainer_name_trailing_space (+1/-1)
gitubuntu/changelog_tests/test_date_1 (+1/-1)
gitubuntu/changelog_tests/test_date_2 (+1/-1)
gitubuntu/changelog_tests/test_distribution (+1/-1)
gitubuntu/changelog_tests/test_distribution_source_1 (+1/-1)
gitubuntu/changelog_tests/test_distribution_source_2 (+1/-1)
gitubuntu/changelog_tests/test_distribution_source_3 (+1/-1)
gitubuntu/changelog_tests/test_distribution_source_4 (+1/-1)
gitubuntu/changelog_tests/test_maintainer_1 (+1/-1)
gitubuntu/changelog_tests/test_maintainer_2 (+1/-1)
gitubuntu/changelog_tests/test_maintainer_3 (+1/-1)
gitubuntu/changelog_tests/test_versions_1 (+1/-1)
gitubuntu/changelog_tests/test_versions_2 (+2/-2)
gitubuntu/changelog_tests/test_versions_3 (+4/-4)
gitubuntu/importer.py (+3/-3)
gitubuntu/importer_service.py (+1/-1)
gitubuntu/importer_service_poller.py (+33/-33)
gitubuntu/importer_service_poller_test.py (+7/-7)
gitubuntu/importer_test.py (+3/-3)
gitubuntu/scriptutils.py (+8/-8)
gitubuntu/source-package-allowlist.txt (+1/-1)
gitubuntu/source_information.py (+6/-6)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Server Team CI bot continuous-integration Approve
Canonical Server Pending
Review via email: mp+422480@code.staging.launchpad.net

Description of the change

Updated everything needed to make git ubuntu compliant with inclusive naming other than the main branch name. It wont cause any change for user workflows but I have changed the names of the package blacklist and whitelist files.

Tested with:

  $ python3 ./setup.py check
  $ python3 ./setup.py build
  $ pytest-3 .

And got the 3 xfailed and 1 failure - test_keyring_backend_found

These failures showed up for both the current master branch and my master branch so nothing was deprecated for me in the unit tests.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:1f999579b08e1642620a1768c4403b7bbb078cc5
https://jenkins.canonical.com/server-team/job/git-ubuntu-ci/1/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/git-ubuntu-ci/1//rebuild

review: Approve (continuous-integration)
Revision history for this message
Robie Basak (racb) wrote :

Thanks! This looks fine, but I'll need to coordinate landing this with adjustments in the production importer service instance, since it references the old names.

I wonder if it's possible to add to CI something to help any non-inclusive wording slipping in in the future? Not needed for this MP though.

review: Approve
Revision history for this message
Lena Voytek (lvoytek) wrote :

> Thanks! This looks fine, but I'll need to coordinate landing this with
> adjustments in the production importer service instance, since it references
> the old names.

Sounds good, thanks!

> I wonder if it's possible to add to CI something to help any non-inclusive
> wording slipping in in the future? Not needed for this MP though.

There should be a way. Some of us on the inclusive naming team have been looking into it. I can get a merge request in for it once we've got it standardized

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches