Colin Watson has proposed merging ~cjwatson/launchpad:fix-ipython-7.9.0 into launchpad:master.
Commit message: Pin flit-core and toml Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/439063 Used when building `backcall` and `ptyprocess` wheels. Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/439062 -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-ipython-7.9.0 into launchpad:master.
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt index fe1562d..abe84b1 100644 --- a/requirements/launchpad.txt +++ b/requirements/launchpad.txt @@ -53,6 +53,7 @@ eggtestinfo==0.3 enum34==1.1.6 fastimport==0.9.8 feedparser==5.2.1 +flit-core==3.3.0 FormEncode==1.3.1 futures==3.3.0 geoip2==2.9.0 @@ -177,7 +178,11 @@ testresources==0.2.7 testscenarios==0.4 testtools==2.5.0 timeline==0.0.7 +<<<<<<< requirements/launchpad.txt traitlets==4.3.3 +======= +toml==0.10.2 +>>>>>>> requirements/launchpad.txt transaction==3.0.1 treq==18.6.0 # lp:~launchpad/twisted:lp-backport
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
