~lmd-jazzededtech/launchpad:master

Last commit made on 2021-11-06
Get this branch:
git clone -b master https://git.launchpad.net/~lmd-jazzededtech/launchpad
Only violethaze74@jazzededtech.com can upload to this branch. If you are violethaze74@jazzededtech.com please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~lmd-jazzededtech/launchpad

Recent commits

5d12b2a... by Jürgen Gmach

Update documentation building

- build documentation via `tox -e docs`
- pin documentation dependencies (requirements/docs.txt)
- update dependencies via `tox -e update-docs`
- fix broken Read the Docs build by pinning documentation dependencies

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

07d5b55... by Jürgen Gmach

Update documentation building

- build documentation via `tox -e docs`
- pin documentation dependencies (requirements/docs.txt)
- update dependencies via `tox -e update-docs`
- fix broken Read the Docs build by pinning documentation dependencies

a1801e8... by Colin Watson

Remove mentions of testing on EC2

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411451

b58b581... by Colin Watson

Remove mentions of testing on EC2

We haven't done this for years.

6383d0e... by Jürgen Gmach

Fix typo

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

04696c0... by Colin Watson

Remove old rw_main_{master,slave} config keys

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411335

d98f29a... by Jürgen Gmach

Fix typo

03c10b1... by Colin Watson

Prevent Translation-en publishing collisions

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/410320

30ec17c... by Colin Watson

Fix conflict between xmlrpc.client and twisted.web.xmlrpc

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411357

34025e1... by Colin Watson

Fix conflict between xmlrpc.client and twisted.web.xmlrpc

Modules need to avoid doing both `import xmlrpc.client` and `from
twisted.web import xmlrpc`, since there's then a namespace collision.
Fortunately there was only one such case.