13684 2019-12-05 16:18:37 +0000 Patchwork instance is python2; needs to be updated to newer Django version (patchwork-fdo is now Django 2.2 LTS) 2022-06-08 22:23:53 +0000 1 1 6 Yocto Project Subprojects Patchwork/Patchtest Patchwork 5.99 x86 Multiple RESOLVED OBSOLETE Medium+ normal 4.99 1 tim.orling changqing.li amanda.r.brindle bluelightning liezhi.yang paul randy.macleod richard.purdie --- --- Don't know oldest_to_newest 85732 0 tim.orling 2019-12-05 16:18:37 +0000 Our fork of the Freedesktop fork is currently running on Python 2.7 [1]. Upstream patchwork-fdo has recently been updated all the way to Django 2.2 LTS [2], which is Python 3 (only). The patches we have on top of the Freedesktop fork need to be investigated to see whether they can be rebased on top of latest patchwork-fdo. Or whether the funtionality our patches added can be upstreamed or is already present in the patchwork-fdo repo. FWIW, things have deviated too much from the original ozlabs patchwork, so any effort to move to "mainline" patchwork is probably fruitless and should be discouraged. [1] http://git.yoctoproject.org/cgit/cgit.cgi/patchwork/tree/tox.ini [2] https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/commit/bb22eebae419e27be0f617f2e5ebb8bf6af86bfc 85737 1 tim.orling 2019-12-05 16:35:09 +0000 The "shortest" path, might be updating to Django 1.11 LTS, which does have Python 3 support. Looking at our fork, I have not yet found what commit from patchwork-fdo we started with. 85971 2 4608 changqing.li 2019-12-25 05:44:06 +0000 Created attachment 4608 local commit of patchwork 85972 3 changqing.li 2019-12-25 05:44:48 +0000 @Randy I rebased patchwork to lastest upstream patchwork-fdo, after rebase, patchwork instance can startup success, I do below simple operation: 1. create projects --- seems work well 2. load one series for one of projects ---work well 3. view patch.html 4. view series.html for step3 and step4, some of the function we add locally not work maybe since there is too much gap, the layout of web is changed. And as I see, most of the work need to work with css/js/html, but unfortunately, I don't have too much knowledge about frontend. So I think it is better to assign this to who is good at this, in this way, it is possible to rebase current patchwork to lastest upstream patchwork-fdo. I have attached the local_commit for refer. 86549 4 randy.macleod 2020-02-21 17:22:50 +0000 Paul, Would you be able to take over this defect from here or could you help Sandy with it? 87449 5 tim.orling 2020-06-09 08:51:20 +0000 I did some review of patchwork-fdo. We forked after this commit: https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/-/commit/d8a74c393d77125bfd308e491be9a82b6b6f27d0 Which correlates to this commit in yp patchwork: http://git.yoctoproject.org/cgit/cgit.cgi/patchwork/commit/?id=d8a74c393d77125bfd308e491be9a82b6b6f27d0 The next commit in yp patchwork has an equivalent commit in patchwork-fdo. http://git.yoctoproject.org/cgit/cgit.cgi/patchwork/commit/?id=2ac92336dcca550fe53aa8dd06793d8456cf7191 https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/-/commit/831ebd7c670d6383c9233335c4084b481d87e1b0 The key commits in patchwork-fdo that bump the Django version are: - Django 2.0: https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/-/commit/6f7389f9b134e388fb4647264d5f9d3e2aa0b54e - Django 2.1: https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/-/commit/732e033b1ea8c59408430b034f955ca10db72ee9 - Django 2.2: https://gitlab.freedesktop.org/patchwork-fdo/patchwork-fdo/-/commit/bb22eebae419e27be0f617f2e5ebb8bf6af86bfc 87450 6 tim.orling 2020-06-09 08:56:37 +0000 We have ~50 commits on top of the fork. These will have to be gone through one by one to see whether the equivalent is already upstream, whether it is functionality upstream would accept, or whether it is a feature specific to us that we cannot live without and we need to carry the technical debt. As an example of likely upstream friendly change (which we would have trouble living without): models.py: Mark patches as superseded when receiving a new revision http://git.yoctoproject.org/cgit/cgit.cgi/patchwork/commit/?id=6bc63d14d298ad97cf1ea3c9439c1fbad081878b Upstream patchwork-fdo has many many commits on top of where we forked. It appears that it will be much less work to try to rebase our changes on top of their tree than the other way around. But upstreaming our changes would be even better. 87451 7 tim.orling 2020-06-09 09:30:06 +0000 Upstream commit count since we forked: git rev-list d8a74c39..HEAD | wc -l 166 Yocto commit count since we forked: git rev-list 855a5db..HEAD | wc -l 45 since we forked: 87452 8 tim.orling 2020-06-09 09:33:48 +0000 Correction: Yocto commit count since we forked: git rev-list d8a74c39..HEAD | wc -l 49 93421 9 richard.purdie 2022-06-08 22:23:53 +0000 We moved to upstream patchwork 4608 2019-12-25 05:44:06 +0000 2019-12-25 05:44:06 +0000 local commit of patchwork local_commit application/octet-stream 4770 changqing.li MGE3YTg0NyBTdGF0ZXMgd2l0aCBuYW1lcyBjb250YWluaW5nIHNwZWNpYWwgY2hhcmFjdGVycyBh cmUgbm90IGNvcnJlY3RseSBlc2NhcGVkIHdoZW4gZ2VuZXJhdGluZyB0aGUgc2VsZWN0IGxpc3Qu IFVzZSBlc2NhcGUoKSB0byBmaXggdGhpcy4KMThkOTMyZCB0b29scy9wb3N0LXJlY2VpdmUuaG9v azogYWRkIG9sZCByZWxlYXNlcyB0byBTVEFURV9NQVAKOWM2OTY3MiBwYXRjaHdvcmsvdGVtcGxh dGVzL3BhdGNod29yay9zZXJpZXMuaHRtbDogQWRkIGxpbmsgY29sdW1uCmIwNmI4NjQgaHRkb2Nz L2pzL3Nlcmllcy5qczogU3R5bGUgYWN0aXZlIHRhYiBpbiBzZXJpZXMgZGF0YSBiYXIKMzI4MDI5 NiBodGRvY3MvanMvc2VyaWVzLmpzOiBEZWZhdWx0IHRvIGNvdmVyIGxldHRlciB2aWV3IG9ubHkg aWYgb25lIGlzIGF2YWlsYWJsZQpiMTY5YzE1IGh0ZG9jcy9jc3Mvc3R5bGUuY3NzOiBmaXggc2Vs ZWN0IHN0eWxlIGluIEZGIGFuZCBJRQo1NjkwNzUzIHBhcnNlbWFpbDoga2VlcCBicmFuY2ggbmFt ZSBpbiBzdWJqZWN0IGZvciBzZXJpZXMKOWQxOTFkMCBwd2NsaWVudDogZW5jb2RlIHBhdGNoIGlu Zm8gb3V0cHV0IHRvIHV0Zi04CjQzMzUwOTUgcG9zdC1yZWNlaXZlLmhvb2s6IHNraXAgcGF0Y2hl cyBpbiBBY2NlcHRlZCBzdGF0ZQoxNDQwZmE5IHB3Y2xpZW50OiB1cGdyYWRlIHRvIGxhdGVzdCB2 ZXJzaW9uCjIzZDAyMDQgdG9vbHMvcG9zdC1yZWNlaXZlLmhvb2s6IHVzZSBnaXQgd29yayBkaXJl Y3RvcnkKYTgyOGZkOCBwd2NsaWVudDogY2F0Y2ggcGF0Y2hfZ2V0X2J5X2hhc2ggZXhjZXB0aW9u CjliM2IzYjQgbW9kZWxzLnB5OiBJbXByb3ZlIFNlcmllcyBuYW1pbmcgd2hlbiBubyBjb3ZlciBs ZXR0ZXIgaXMgcHJvdmlkZWQKMWEwNmQxNiBwYXJzZW1haWwucHk6IEltcHJvdmUgY2xlYW5fc3Vi amVjdCBmdW5jdGlvbgowOTIzZTJhIHBhcnNlbWFpbC5weTogSW1wcm92ZSBmaW5kX3Nlcmllc19m b3JfbWFpbAowYTQ4ZDUxIHBhcnNlbWFpbC5weTogSW1wcm92ZSBzdGF0dXMtY2hhbmdlLXRocm91 Z2gtZW1haWwKMDg2NmE2NSBwYWdpbmF0aW9uLmh0bWw6IEFkZCBhcmNoaXZlIHBhcmFtZXRlciB0 byBsaW5rcwoyYTlhOWQxIHBhdGNod29yay9wYWdpbmF0b3IucHk6IEFkZCBhcmNoaXZlIHBhcmFt ZXRlcgowZDA5NzZkIHNlcmllcy5weTogcmV0dXJuIGJ1bmRsZSBvYmplY3RzIG9ubHkgd2hlbiBh dXRoZW50aWNhdGVkCjk0MzExODMgc2VyaWVzLmpzOiBzaG93L2hpZGUgdGVzdHMgcmVzdWx0cyBz ZWN0aW9uIGZyb20gY29udGV4dAo2ODBjYjJkIHNlcmllcy5odG1sOiBhZGQgc2VyaWVzIHRlc3Rz IHJlc3VsdHMgc2VjdGlvbiBpbiB2aWV3Cjc5MjgwYTcgcGF0Y2gtbGlzdDogY2FsbCB0YWJsZWNo ZWNrYm94IHBsdWdpbiBmcm9tIHBhdGNoLWxpc3QKZDJmOGMxNCBqcXVlcnkudGFibGVjaGVja2Jv eDogYWRkIHBsdWdpbiBmb3IgbXVsdGlzZWxlY3QgZnVuY3Rpb25hbGl0eQozODJjZjVhIHNlcmll cy5qczogc3VwcG9ydCBzaGlmdC1zZWxlY3QgcmFuZ2UKOTE1Yjk1YSBzZXJpZXMuanM6IGFkZCBw YXRjaC1zZWxlY3Rpb24tY2hlY2tib3ggY29udHJvbCBmdW5jdGlvbnMKNTUxNDFhMiBzZXJpZXMu aHRtbDogYWRkIHBhdGNoIGFuZCBidW5kbGUgZWRpdGlvbiBmb3JtcyBhbmQgY2hlY2tib3hlcwpk OGY3ZGY3IHNlcmllcy5weTogYWRkIHBhdGNoIGFuZCBidW5kbGUgZWRpdGlvbiBhY3Rpb25zIHRv IHZpZXcKYzYzNDU2MiBwb3N0LXJlY2VpdmVfYXN5bmM6IEFzeW5jaHJvbm91c2x5IHVwZGF0ZSBt ZXJnZWQgcGF0Y2hlcwowZmRlNTQxIHBhcnNlbWFpbDogRml4IHR5cG8gYXQgcHJlZml4LWNvbXBp bGUgc3RhdGVtZW50CjRlZjE0YmMgdmlld3Mvc2VyaWVzOiBmaXggc3ludGF4IGF0IGltcG9ydCBz dGF0ZW1lbnQKNmFmYWZiMSBnaXQtcHc6IGluY2x1ZGUgYnVuZGxlIHN1Yi1jb21tYW5kCjY2NjYz OTkgcGFyc2VtYWlsOiBTcGxpdCBQQVRDSCBwcmVmaXggaWYgbm90IHNpbmdsZQoyNjdiZjg3IHBh cnNlbWFpbDogUHJvY2VzcyBlbWFpbCB3aXRoIGR1cGxpY2F0ZWQgbWVzc2FnZS1pZApiZDBmOWJm IHNlcmllcy5weTogQWRkIFBPU1QgY2FsbApiOWMxOGU5IHNlcmllcy5qczogR2V0IHBhdGNoIGlk IGFuZCBwYXNzIGl0IHRvIFBPU1QgcmVxdWVzdAo1NDNmOTZhIHBhcnNlbWFpbC5weTogQ2hlY2sg aWYgYXV0aG9yLnVzZXIgcHJvZmlsZSBleGlzdHMKMmY5ZTRkZSBwYXJzZW1haWw6IFNldCBwYXRj aCBzdGF0ZSBmcm9tIGVtYWlsIG1ldGFkYXRhCjg2Y2UxYjcgc2VyaWVzLmh0bWw6IEluY2x1ZGUg dG9nZ2xlX2hlYWRlcnMgc2NyaXB0CjFhMDk2ZWMgcGFyc2VtYWlsLnB5OiBJbXByb3ZlIG5ldyBw YXRjaCBmaWx0ZXJpbmcKZWJkM2M0NSBwYXRjaHdvcmsvdGVtcGxhdGVzL3BhdGNod29yay9zZXJp ZXM6IEltcHJvdmUgc2VyaWVzIHZpZXcKOGQzMzBmYyBwYXRjaHdvcmsubW9kZWxzOiBJbmNsdWRl IGZpcnN0IHBhdGNoJ3MgbmFtZSBpbiBzZXJpZXMgbmFtZQo4NzU2YjczIFJFQURNRTogRGVzY3Jp YmUgcmVwb3NpdG9yeSBhbmQgbGlua3MKMGMzMWM1MCBwYXRjaHdvcmsuYmluLnBhcnNlbWFpbDog SW1wcm92ZSBwdWxsLXJlcXVlc3QgcmVnZXgKN2RmYjY4YyBwYXRjaHdvcmsuYmluLnBhcnNlbWFp bDogVXNlIG9sZGVzdCBoZWFkZXIgcmVmZXJlbmNlcwpjMWNlYTdjIFBhdGNod29yazogYWRkcyBy ZXZpc2lvbiBudW1iZXIgdG8gUFcgZW1haWwKODU1YTVkYiBwYXJzZW1haWw6IEFsbG93IG5ldyBz ZXJpZXMgd2l0aCBwdWxsLXJlcXVlc3QgbWVzc2FnZXMKZmRiZjRmYyB0ZXN0X3Nlcmllcy5weTog Q2hlY2sgc2VyaWVzLW5ldy1yZXZpc2lvbiBldmVudHMgZm9yIG5ldyByZXZpc2lvbnMKNmJjNjNk MSBtb2RlbHMucHk6IE1hcmsgcGF0Y2hlcyBhcyBzdXBlcnNlZGVkIHdoZW4gcmVjZWl2aW5nIGEg bmV3IHJldmlzaW9uCjJhYzkyMzMgZG9jcy9yZXF1aXJlbWVudHMtZGV2LnR4dDogcmVxdWlyZSBk amFuZ28tZGVidWctdG9vbGJhciB2ZXIuIDEuNAoKCgpnaXQgZGlmZiAyYWM5MjMzIDBhN2E4NDcg LS1zdGF0CiBSRUFETUUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg MjEgKysrKysrKysrCiBnaXQtcHcvZ2l0LXB3ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgNTIgKysrKysrKysrKysrKysrKysrKystLQogaHRkb2NzL2Nzcy9zdHlsZS5jc3MgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICA5ICsrKysKIGh0ZG9jcy9qcy9qcXVlcnkudGFibGVj aGVja2JveC5qcyAgICAgICAgICAgICB8IDE2NSArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaHRkb2NzL2pzL3Nlcmll cy5qcyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjIxICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIHBhdGNod29yay9iaW4vcGFyc2VtYWlsLnB5ICAgICAgICAgICAgICAg ICAgICB8IDE2NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLQogcGF0Y2h3b3JrL2Jpbi9wd2NsaWVudCAgICAgICAgICAg ICAgICAgICAgICAgIHwgMjM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiBwYXRjaHdvcmsvZmlsdGVycy5weSAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIg Ky0KIHBhdGNod29yay9tb2RlbHMucHkgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICA4NyAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIHBhdGNod29yay9wYWdpbmF0b3Iu cHkgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMSArCiBwYXRjaHdvcmsvdGVtcGxhdGVzL3Bh dGNod29yay9wYWdpbmF0aW9uLmh0bWwgfCAgMTAgKystLS0KIHBhdGNod29yay90ZW1wbGF0ZXMv cGF0Y2h3b3JrL3BhdGNoLWxpc3QuaHRtbCB8ICAgMiArCiBwYXRjaHdvcmsvdGVtcGxhdGVzL3Bh dGNod29yay9wYXRjaC5odG1sICAgICAgfCAgMTUgKysrKy0tLQogcGF0Y2h3b3JrL3RlbXBsYXRl cy9wYXRjaHdvcmsvc2VyaWVzLmh0bWwgICAgIHwgMzAxICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHBhdGNod29yay90 ZXN0cy90ZXN0X3Nlcmllcy5weSAgICAgICAgICAgICAgICB8ICAgOSArKy0tCiBwYXRjaHdvcmsv dmlld3MvYXBpLnB5ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEgKwogcGF0Y2h3b3JrL3Zp ZXdzL3Nlcmllcy5weSAgICAgICAgICAgICAgICAgICAgIHwgMTAyICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLQogdG9vbHMvcG9zdC1yZWNlaXZlLmhvb2sgICAgICAg ICAgICAgICAgICAgICAgIHwgIDgwICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQog dG9vbHMvcG9zdC1yZWNlaXZlX2FzeW5jLmhvb2sgICAgICAgICAgICAgICAgIHwgIDk3ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDE5IGZpbGVzIGNoYW5nZWQsIDEz NjUgaW5zZXJ0aW9ucygrKSwgMjEzIGRlbGV0aW9ucygtKQoKCgoK