From metatracker at psf.upfronthosting.co.za Fri Jul 1 11:04:18 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Fri, 01 Jul 2016 15:04:18 +0000 Subject: [Tracker-discuss] [issue595] Set stage to 'resolved' when an issue is closed In-Reply-To: <1465455890.27.0.55118446796.issue595@psf.upfronthosting.co.za> Message-ID: <1467385458.94.0.580265681164.issue595@psf.upfronthosting.co.za> R David Murray added the comment: Looks OK to me (without testing it). You probably meant to write 'status_changed' twice in the assignment for status_close, though. ---------- status: unread -> chatting _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 5 20:26:49 2016 From: metatracker at psf.upfronthosting.co.za (John Rouillard) Date: Wed, 06 Jul 2016 00:26:49 +0000 Subject: [Tracker-discuss] [issue467] People searches return all issues In-Reply-To: <1339620677.42.0.0885958608916.issue467@psf.upfronthosting.co.za> Message-ID: <1467764809.13.0.358175628323.issue467@psf.upfronthosting.co.za> John Rouillard added the comment: See: http://issues.roundup-tracker.org/issue2550855 for fix. The anonymous user needs to have search permission for users added. I am not sure what version of roundup is running here, search perms were added at 1.4.19 so ... ---------- nosy: +rouilj _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 5 21:41:45 2016 From: metatracker at psf.upfronthosting.co.za (John Rouillard) Date: Wed, 06 Jul 2016 01:41:45 +0000 Subject: [Tracker-discuss] [issue448] Cannot log into search results page In-Reply-To: <1333644181.93.0.427714955722.issue448@psf.upfronthosting.co.za> Message-ID: <1467769305.74.0.728748907075.issue448@psf.upfronthosting.co.za> John Rouillard added the comment: I just wanted to mention that there is an upstream fix for this that you may want to include. See: http://issues.roundup-tracker.org/issue2550785 Code: https://sourceforge.net/p/roundup/code/ci/894aa07be6cbdc4f55634f4d2c11d62232cf0806/ ---------- nosy: +rouilj _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 5 22:03:42 2016 From: metatracker at psf.upfronthosting.co.za (John Rouillard) Date: Wed, 06 Jul 2016 02:03:42 +0000 Subject: [Tracker-discuss] [issue555] Registration does not report name conflicts In-Reply-To: <1413199530.16.0.0951056574514.issue555@psf.upfronthosting.co.za> Message-ID: <1467770622.53.0.56271780524.issue555@psf.upfronthosting.co.za> John Rouillard added the comment: Pulled upstream as: http://issues.roundup-tracker.org/issue2550920 ---------- nosy: +rouilj _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 5 22:15:36 2016 From: metatracker at psf.upfronthosting.co.za (John Rouillard) Date: Wed, 06 Jul 2016 02:15:36 +0000 Subject: [Tracker-discuss] [issue581] Add rest endpoint to roundup In-Reply-To: <1456613089.91.0.963732827198.issue581@psf.upfronthosting.co.za> Message-ID: <1467771335.99.0.931651715341.issue581@psf.upfronthosting.co.za> John Rouillard added the comment: maciej, do you have any updates to this? ---------- nosy: +rouilj _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 5 22:32:45 2016 From: metatracker at psf.upfronthosting.co.za (John Rouillard) Date: Wed, 06 Jul 2016 02:32:45 +0000 Subject: [Tracker-discuss] [issue598] Hide retired queries in "Your Queries" sidebar In-Reply-To: <1465630876.44.0.0882967151952.issue598@psf.upfronthosting.co.za> Message-ID: <1467772365.22.0.920528934942.issue598@psf.upfronthosting.co.za> John Rouillard added the comment: A version of this was checked in upstream. http://issues.roundup-tracker.org/issue2550831 screenshots are attached to the upstream issue. If the query is on the user's active list (i.e. in the sidebar) one of two things is shown: If you are the query owner, you can undelete it and then remove it from your list then re-retire it to remove it entirely. My thought is it takes two steps to truly delete a query for the owner: remove from your active list and then delete. I have accidentally clicked on delete and had to resort to unretire in roundup-admin to recover my query. If you are not the query owner you can remove the query from your active list. I haven't looked at the attached patch to see how it differs from the original patch that I modified and adopted upstream. ---------- nosy: +rouilj _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Mon Jul 11 16:37:06 2016 From: metatracker at psf.upfronthosting.co.za (=?utf-8?b?0JrQvtGA0LXQvdCx0LXRgNCzINCc0LDRgNC6?=) Date: Mon, 11 Jul 2016 20:37:06 +0000 Subject: [Tracker-discuss] [issue562] Gmail (google) marks registration email as spam In-Reply-To: <1422157456.62.0.726959967661.issue562@psf.upfronthosting.co.za> Message-ID: <1468269426.74.0.115067444419.issue562@psf.upfronthosting.co.za> ????????? ???? added the comment: Still no progress? you just required to add SPF-recrod to DNS ---------- nosy: +socketpair _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 12 04:15:41 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Tue, 12 Jul 2016 08:15:41 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page Message-ID: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> New submission from Maciej Szulik: Anish here are my review comments: 1. detectors/github_pullrequest_url.py Add an empty line before imports. > if parsed_url.scheme not in ('http', 'https'): You're expecting http or https, but what if I paste github.com/python/cpython/pull/41 which is perfectly valid but will fail your validator? You can actually add http on your own if it's missing, for purity ;) > newvalues['url'] = (parsed_url.scheme + "://" + parsed_url.netloc + parsed_url.path) Why do you need to reconstruct the url in this case? Why not just assigning the one you verified is ok? iow. newvalues['url'] = url > github_url_id = db.github_pullrequest_url.lookup(pullrequest_number) No need to assign to a value if you're not using it. 2. html/issue.item.html > GitHub Pull Request URL: The name is lengthy, make it shorter 'GitHub PR' should be enough, imho. Don't forget to change error messages so they reflect that change as well. > Pull Request Change to Link. > Put entire link, it won't be long, and the short version looks awful. > edit It would be nice to also have Remove button similarly to how we have with files, hgrepos, etc. See the files section on this page, as an example. Additionally there's an empty line right after this cell, please remove ;) 3. schema.py > github_pullrequest_url = Class(db, "github_pullrequest_url", Make shorter, 'github_prs' is enough. > pullrequest_number=String(), 'id', 'no', 'pr_no' one of them will be sufficient, as well. Have we discussed the possibility of having the links being crossed when the PR is merged or at least having a separate column with the state, I think we did. Can you link the issue if one exists? _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 12 04:47:30 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Tue, 12 Jul 2016 08:47:30 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468313250.52.0.993884685205.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: + url = newvalues.get('url', '') You should also return early if there is no 'url' key in newvalues. i18n:translate="" can be removed. I don't think we are going to support a non-English language. I would also prefer a 'remove' link instead of 'edit'. This is just a nitpick, but it would be nice to not use name 'github' in schema.py. We may switch to another pull request/merge request based software in the future. + + + + + The empty can be removed. ---------- nosy: +berker.peksag _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 12 04:54:23 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Tue, 12 Jul 2016 08:54:23 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468313663.5.0.147037723185.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: Also, I'm not fan of such a manual work. I would prefer to have a JSON endpoint which queries open pull requests on python/cpython and match if the title of a pull request contains the issue number. You can see https://code.djangoproject.com/ticket/25227 for an example implementation of the idea (notice the "Pull Requests" field). _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 12 08:54:07 2016 From: metatracker at psf.upfronthosting.co.za (Tim Tisdall) Date: Tue, 12 Jul 2016 12:54:07 +0000 Subject: [Tracker-discuss] [issue562] Gmail (google) marks registration email as spam In-Reply-To: <1468269426.74.0.115067444419.issue562@psf.upfronthosting.co.za> Message-ID: Tim Tisdall added the comment: Your comment got emailed to me with no DMARC fail, so that's good. But adding a policy would be good. On 11 July 2016 at 16:37, ????????? ???? wrote: > > ????????? ???? added the comment: > > Still no progress? you just required to add SPF-recrod to DNS > > ---------- > nosy: +socketpair > > _______________________________________________________ > PSF Meta Tracker > > _______________________________________________________ _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 12:45:07 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Wed, 13 Jul 2016 16:45:07 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468428307.4.0.752438793053.issue586@psf.upfronthosting.co.za> Anish Shah added the comment: > Why do you need to reconstruct the url in this case? Why not just assigning the one you verified is ok? I'm reconstructing because URL might contain fragment identifier/query string. What do you think? > Make shorter, 'github_prs' is enough. > 'id', 'no', 'pr_no' one of them will be sufficient, as well. I will change this. But, I will need to change this in all the patches that I have submitted. > Have we discussed the possibility of having the links being crossed when the PR is merged or at least having a separate column with the state, I think we did. I have added a 'state' field in issue590 _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 12:47:48 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Wed, 13 Jul 2016 16:47:48 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468428468.4.0.787248414281.issue586@psf.upfronthosting.co.za> Anish Shah added the comment: @berker.peksag Thank you for the review. I will make those changes. > Also, I'm not fan of such a manual work. I would prefer to have a JSON endpoint > which queries open pull requests on python/cpython and match if the title of a > pull request contains the issue number. This is the first patch as a part of my GSoC project. You can check issue589 where I'm using GitHub webhooks to link issues automatically. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 13:32:15 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Wed, 13 Jul 2016 17:32:15 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468431135.25.0.82089210348.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: Issue 589 is a different feature and it should be discussed there (by the way it would be really nice if you could give more information about the feature and the patch -- I had to read the whole patch to understand what it does). The problem with this implementation is that I will need to go to bugs.python.org/issueXXXX and paste a URL everytime I open a pull request on GitHub. Instead of this manual step, Roundup should automatically look for "Issue #NNNN" in all pull request titles and list all matched items by using JavaScript on bugs.python.org/issueXXXX. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 13:40:04 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Wed, 13 Jul 2016 17:40:04 +0000 Subject: [Tracker-discuss] [issue600] Convert patches to GitHub Pull Request In-Reply-To: <1466359411.87.0.930389612417.issue600@psf.upfronthosting.co.za> Message-ID: <1468431604.77.0.356692903428.issue600@psf.upfronthosting.co.za> Berker Peksag added the comment: How do you get the correct author information of the patch? I don't think there is an easy way [1] to extract the author information to use it in the pull requests. [1] You could probably check the GitHub username field of the author but you could have to guess it anyway and I don't think we should guess it. People should convert their patches to pull requests manually. ---------- nosy: +berker.peksag _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 13:46:21 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Wed, 13 Jul 2016 17:46:21 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468431981.11.0.362654975381.issue586@psf.upfronthosting.co.za> R David Murray added the comment: Berker: I presume the point here is that this creates the field, and issue 589 fills it in automatically by having github call roundup when a PR is created. I haven't looked at either patch closely enough to know if I'm right, but that's what I'd expect the implementation to look like. ---------- nosy: +r.david.murray _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 13:50:27 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Wed, 13 Jul 2016 17:50:27 +0000 Subject: [Tracker-discuss] [issue592] Show GitHub comments on b.p.o Message-ID: <1468432227.01.0.946283993334.issue592@psf.upfronthosting.co.za> New submission from Berker Peksag: Thanks for the patches! :) GitHub already spams every single comment made on a pull request and this will make it worse. I'm -1 on this. It's fine if other core developers want to backup review comments, but it shouldn't be shown on bugs.python.org by default. (Also, please attach standalone patches. I think I need some another patch to be able to import and test these patches.) ---------- nosy: +berker.peksag _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 13:55:37 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Wed, 13 Jul 2016 17:55:37 +0000 Subject: [Tracker-discuss] [issue590] Show Pull Request status on b.p.o Message-ID: <1468432537.9.0.749472602209.issue590@psf.upfronthosting.co.za> New submission from Berker Peksag: Do we need a separate issue for this? I think this can be done in issue 586. ---------- nosy: +berker.peksag _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 15:40:13 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Wed, 13 Jul 2016 19:40:13 +0000 Subject: [Tracker-discuss] [issue592] Show GitHub comments on b.p.o In-Reply-To: <1468432227.01.0.946283993334.issue592@psf.upfronthosting.co.za> Message-ID: <1468438813.34.0.117660477168.issue592@psf.upfronthosting.co.za> R David Murray added the comment: If github batched the review comments, what we would want (what we've wanted for a long time from reitveld) is a note posted to b.p.o that there *are* review comments. But since github does *not* batch review comments, posting every comment (especially without the relevant context) may indeed be noisy. On the other hand, I'd not like to see the bulk of the *discussion* of the issue (as opposed to the code) be hidden away on github, which it undoubtably would be. So on balance I'm in favor of reflecting the comments to bugs, but not adamantly so. ---------- nosy: +r.david.murray _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 13 15:41:35 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Wed, 13 Jul 2016 19:41:35 +0000 Subject: [Tracker-discuss] [issue592] Show GitHub comments on b.p.o In-Reply-To: <1468432227.01.0.946283993334.issue592@psf.upfronthosting.co.za> Message-ID: <1468438895.09.0.572538863063.issue592@psf.upfronthosting.co.za> R David Murray added the comment: But, really, this level of discussion should take place on the workflow mailing list, not in the context of the patch. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Mon Jul 18 15:11:48 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Mon, 18 Jul 2016 19:11:48 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468869108.81.0.988311210971.issue586@psf.upfronthosting.co.za> Maciej Szulik added the comment: @anish.shah > I'm reconstructing because URL might contain fragment identifier/query string. What do you think? Doesn't matter, the parsed_url is just an object representation of that url. > I will change this. But, I will need to change this in all the patches that I have submitted. Sorry, but yes please. And apply Berker's suggestion of not having github word in it, as well. > I have added a 'state' field in issue590 Cool. @Berker > Issue 589 is a different feature and it should be discussed there (by the way it would be really nice if you could give more information about the feature and the patch -- I had to read the whole patch to understand what it does). > The problem with this implementation is that I will need to go to bugs.python.org/issueXXXX and paste a URL everytime I open a pull request on GitHub. Instead of this manual step, Roundup should automatically look for "Issue #NNNN" in all pull request titles and list all matched items by using JavaScript on bugs.python.org/issueXXXX. It's exactly like David is saying. With issue 589 b.p.o is notified through github webhook of new events, such as PRs in which we parse the title and comment in search for bpoNNN and link the PR automatically. The idea of having a client side javascript assuming you have a gh opened in one tab and bpo in other doesn't seem right. I'm currently reviewing Anish all submissions from his GSoC and he'll soon create an extensive article describing all the things he has done. Anyway thanks for your time and review! _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Mon Jul 18 15:34:02 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Mon, 18 Jul 2016 19:34:02 +0000 Subject: [Tracker-discuss] [issue587] Link GitHub pull requests in comments Message-ID: <1468870442.58.0.0827952665631.issue587@psf.upfronthosting.co.za> New submission from Maciej Szulik: @anish.shah > pullrequest_number = match.group('id') Use shorter naming, like mentioned in #586, iow pr_id/pr_no. > github_pullrequest_url_id = cl.lookup(pullrequest_number) There are two problems with this approach: 1. You lookup from the list of all patches, not necessarily connected with that particular issue. Iow. I have issue1 with PR1 and issue2 w/o PR number and when I enter PR1 in issue2 I'm getting a link to PR1 from issue1, which should not happen. Either you want to restrict that to this particular issue, you'd need to check issues's prs specifically to fix it. Or... 2. Don't do lookups at all, but always assume the format we've settled on to be something you should turn into a link. Additionally, you could think of adding such link to the list of links. Personally, I'm more towards the latter. Thanks! _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Mon Jul 18 16:20:48 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Mon, 18 Jul 2016 20:20:48 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1468873248.17.0.081706483517.issue589@psf.upfronthosting.co.za> Maciej Szulik added the comment: @anish.shah roundup/github_pullrequest_url.py > def __init__(self, client): > .... > self._validate_webhook_secret() > self._verify_request() > self._extract() Don't put the entire action in the constructor of the object. Its responsibility is to create an object and then you call actions on it. Here dispatch is the method you should create that should do what you want here. > result = compare_digest(signature, header_signature) > if not result: Replace with: if not compare_digest(signature, header_signature): reads better. > def _get_event(self): > event = self.request.headers.get('X-GitHub-Event', None) > return event Replace with: def _get_event(self): return self.request.headers.get('X-GitHub-Event', None) > if event == 'pull_request': > PullRequest(self.db, self.data) > elif event == 'issue_comment': > IssueComment(self.db, self.data) Same here. Create objects and act upon them, don't run actions inside the initialization. I'll get back to this patch once again tomorrow. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Mon Jul 18 23:00:51 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Tue, 19 Jul 2016 03:00:51 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468897251.3.0.709162026897.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: I'm not sure I explained myself clearly so here is a quick and dirty patch, including a screenshot: https://dl.dropboxusercontent.com/u/166024/gh-pr.png Since I don't have meaningful data I chose Django as an example. _______________________________________________________ PSF Meta Tracker _______________________________________________________ -------------- next part -------------- diff --git a/html/issue.item.html b/html/issue.item.html --- a/html/issue.item.html +++ b/html/issue.item.html @@ -10,16 +10,35 @@ /> + New Issue New Issue Editing Remote hg repo: + + + Pull requests: + + + + + + + + + + +

From metatracker at psf.upfronthosting.co.za Tue Jul 19 03:11:01 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Tue, 19 Jul 2016 07:11:01 +0000 Subject: [Tracker-discuss] [issue581] Add rest endpoint to roundup In-Reply-To: <1456613089.91.0.963732827198.issue581@psf.upfronthosting.co.za> Message-ID: <1468912261.52.0.207474761319.issue581@psf.upfronthosting.co.za> Maciej Szulik added the comment: @rouilj it's currently stuck, hopefully after summer I'll be able to get back to the topic. Sorry :( _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 14:11:48 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Tue, 19 Jul 2016 18:11:48 +0000 Subject: [Tracker-discuss] [issue587] Link GitHub pull requests in comments In-Reply-To: <1468870442.58.0.0827952665631.issue587@psf.upfronthosting.co.za> Message-ID: <1468951908.45.0.235720900721.issue587@psf.upfronthosting.co.za> Anish Shah added the comment: Description about this issue: If any of the comments on b.p.o contain strings like "PR NNN", then it should automatically add an href link to the GitHub PR. For example, input - PR 23 looks great output - PR 23 looks great _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 14:19:30 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Tue, 19 Jul 2016 18:19:30 +0000 Subject: [Tracker-discuss] [issue587] Link GitHub pull requests in comments In-Reply-To: <1468870442.58.0.0827952665631.issue587@psf.upfronthosting.co.za> Message-ID: <1468952370.08.0.368005086297.issue587@psf.upfronthosting.co.za> Anish Shah added the comment: > 1. You lookup from the list of all patches, not necessarily connected with that particular issue. Suppose there was an issue1 which was resolved by PR1. Now, this PR1 introduced a new bug - issue2. In this case, we might want to discuss about PR1 in issue2. What do you think? > 2. Don't do lookups at all, but always assume the format we've settled on to be something you should turn into a link. Additionally, you could think of adding such link to the list of links. I think, this might not be a good idea. For example, a comment has a string like "PR 23" and we extract the number "23". Now, we need to create the GitHub URL by ourself like - url = "https://github.com/python/cpython/pull" + pr_no This will fail if in future Github decides to change the URL for pull request. Let me know what do you think? _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 14:43:03 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Tue, 19 Jul 2016 18:43:03 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1468953783.21.0.149183017157.issue589@psf.upfronthosting.co.za> Anish Shah added the comment: Description about this issue:- GitHub provides webhooks to subscribe to events on GitHub.com. These events include - creating a new PR, adding a comment on PR, etc. If one of this event is triggered, it sends an HTTP POST request with JSON data of that particular event to the configured URL in webhooks settings. For eg, whenever a new PR is created on GitHub, it will send an HTTP POST request on http://bugs.python.org/add_pull_request. The payload contains information like id, title, body, commits of PR. If the title or the body of PR contains string like "Fixes bpoNNN", then we link the PR id to issueNNN on bpo _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 14:55:27 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Tue, 19 Jul 2016 18:55:27 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468954527.07.0.275657853897.issue586@psf.upfronthosting.co.za> Anish Shah added the comment: @berker.peksag I looked at your patch and screenshot. What you are doing is calling GitHub API using JS each time an issue page is loaded and showing PRs which have a string like "Issue #NN" in its title. I have just added a description in issue 589 (sorry for not adding before). GitHub webhooks will provide JSON data which will contain information about PR title (just like GitHub APIs). If the title contains a string like "Fixes bpoNNN", we had that PR to PostGres DB. I hope this makes _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 15:12:16 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Tue, 19 Jul 2016 19:12:16 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468955536.14.0.920345893454.issue586@psf.upfronthosting.co.za> Anish Shah added the comment: I have updated the patch according to reviews suggested by @maciej.szulik and @berker.peksag Description:- This patch adds a new table "pull_request" which is used to save GitHub PR URLs. URL can be added manually using "GitHub PR" field on issue's page. --- GitHub PR URL will also be added automatically in two ways - for that, you can have a look at issue589 and issue600 _______________________________________________________ PSF Meta Tracker _______________________________________________________ -------------- next part -------------- diff --git a/detectors/pull_request.py b/detectors/pull_request.py new file mode 100644 index 0000000..6a206e5 --- /dev/null +++ b/detectors/pull_request.py @@ -0,0 +1,35 @@ +# Auditor for GitHub URLs +# Check if it is a valid GitHub Pull Request URL and extract PR number + +import re +import urlparse + + +def validate_github_url(db, cl, nodeid, newvalues): + url = newvalues.get('url', '') + if url == '': + return + parsed_url = urlparse.urlparse(url) + if parsed_url.scheme == '': + url = 'https://' + url + parsed_url = urlparse.urlparse(url) + if parsed_url.scheme not in ('http', 'https'): + raise ValueError("Invalid URL scheme in GitHub PR") + if 'github.com' not in parsed_url.netloc or 'pull' not in parsed_url.path: + raise ValueError("Invalid GitHub PR") + newvalues['url'] = parsed_url.geturl() + regex = re.match(".*/pull/(\d+)", newvalues['url']) + if regex and len(regex.groups()) == 1: + pr_no = regex.groups()[0] + try: + db.pull_request.lookup(pr_no) + raise ValueError("GitHub PR already added to an issue") + except KeyError: + newvalues['pr_no'] = pr_no + else: + raise ValueError("Invalid GitHub PR") + + +def init(db): + db.pull_request.audit('create', validate_github_url) + db.pull_request.audit('set', validate_github_url) diff --git a/html/issue.item.html b/html/issue.item.html index ddc4ec3..17eecd1 100644 --- a/html/issue.item.html +++ b/html/issue.item.html @@ -220,6 +220,14 @@
GitHub PR:	+ + +

@@ -273,6 +281,43 @@

+ + + + + + + + + + + + + + + + +

GitHub Pull Requests
Link	Author	Date	Edit	Remove
+ + GitHub PR link + +	+ creator's name +	+ creation date +	+ edit +	+ + + + + +

diff --git a/schema.py b/schema.py index d91bf7b..c125a5f 100644 --- a/schema.py +++ b/schema.py @@ -173,6 +173,12 @@ hgrepo = Class(db, "hgrepo", patchbranch=String(), ) +pull_request = Class(db, "pull_request", + url=String(), + pr_no=String(),) + +pull_request.setkey("pr_no") + # IssueClass automatically gets these properties in addition to the Class ones: # title = String() # messages = Multilink("msg") @@ -194,7 +200,8 @@ issue = IssueClass(db, "issue", stage=Link('stage'), nosy_count=Number(), message_count=Number(), - hgrepos=Multilink('hgrepo')) + hgrepos=Multilink('hgrepo'), + pull_requests=Multilink('pull_request')) # # TRACKER SECURITY SETTINGS @@ -222,7 +229,7 @@ for r in 'User', 'Developer', 'Coordinator': for cl in ('issue_type', 'severity', 'component', 'version', 'priority', 'stage', 'status', 'resolution', - 'issue', 'keyword', 'hgrepo'): + 'issue', 'keyword', 'hgrepo', 'pull_request'): db.security.addPermissionToRole('User', 'View', cl) db.security.addPermissionToRole('Anonymous', 'View', cl) @@ -233,6 +240,13 @@ p = db.security.addPermission(name='Edit', klass='hgrepo', check=may_edit_hgrepo properties=['url', 'patchbranch']) db.security.addPermissionToRole('User', p) +def may_edit_github_url(db, userid, itemid): + return userid == db.pull_request.get(itemid, "creator") +db.security.addPermissionToRole('User', 'Create', 'pull_request') +p = db.security.addPermission(name='Edit', klass='pull_request', + check=may_edit_github_url, properties=['url']) +db.security.addPermissionToRole('User', p) + class may_view_spam: def __init__(self, klassname): self.klassname = klassname @@ -292,7 +306,7 @@ p = db.security.addPermission(name='Create', klass='issue', properties=('title', 'type', 'components', 'versions', 'severity', - 'messages', 'files', 'nosy', 'hgrepos'), + 'messages', 'files', 'nosy', 'hgrepos', 'pull_requests'), description='User can report and discuss issues') db.security.addPermissionToRole('User', p) @@ -300,7 +314,7 @@ p = db.security.addPermission(name='Edit', klass='issue', properties=('title', 'type', 'components', 'versions', 'severity', - 'messages', 'files', 'nosy', 'hgrepos'), + 'messages', 'files', 'nosy', 'hgrepos', 'pull_requests'), description='User can report and discuss issues') db.security.addPermissionToRole('User', p) @@ -335,7 +349,7 @@ for cl in ('issue', 'file', 'msg', 'keyword'): ########################## for cl in ('issue_type', 'severity', 'component', 'version', 'priority', 'stage', 'status', 'resolution', 'issue', - 'file', 'msg', 'hgrepo'): + 'file', 'msg', 'hgrepo', 'pull_request'): db.security.addPermissionToRole('Coordinator', 'View', cl) db.security.addPermissionToRole('Coordinator', 'Edit', cl) db.security.addPermissionToRole('Coordinator', 'Create', cl) From metatracker at psf.upfronthosting.co.za Tue Jul 19 16:00:00 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Tue, 19 Jul 2016 20:00:00 +0000 Subject: [Tracker-discuss] [issue587] Link GitHub pull requests in comments (depends on issue 586) In-Reply-To: <1468870442.58.0.0827952665631.issue587@psf.upfronthosting.co.za> Message-ID: <1468958400.84.0.899888116485.issue587@psf.upfronthosting.co.za> R David Murray added the comment: Don't do lookups, do mechanical translation. The translation happens at page rendering time, so if github changes it URLs (or we move to a different provider), we just change the linkifier code to match. ---------- nosy: +r.david.murray _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 16:03:39 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Tue, 19 Jul 2016 20:03:39 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks (depends on issue586) In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1468958619.77.0.485694246015.issue589@psf.upfronthosting.co.za> R David Murray added the comment: And if the PR doesn't reference an issue number, it should create a new issue. I think we should also look for issue numbers in the body of the PR as well. The user might put it in the description rather than the title, if they provide a description. ---------- nosy: +r.david.murray _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 16:09:45 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Tue, 19 Jul 2016 20:09:45 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1468958985.89.0.784559564866.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: I don't have an objection to a general purpose webhook (I wrote such webhooks for GitHub before.) Using a webhook for a simple task like this will only make the implementation more complicated. I don't see a reason to store pull request URLs in database. We've also discussed backup pull request data (including review comments) so storing URLs in database won't be needed in long term anyway. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Tue Jul 19 16:19:56 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Tue, 19 Jul 2016 20:19:56 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks (depends on issue586) In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1468959596.34.0.86342361078.issue589@psf.upfronthosting.co.za> Berker Peksag added the comment: > And if the PR doesn't reference an issue number, it should create a new issue. Wouldn't that create too much noise for trivial pull requests like typo fixes, documentation tweaks and code style changes? Also how do we handle if the user doesn't have an account on bugs.python.org? ---------- nosy: +berker.peksag _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 20 10:06:39 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Wed, 20 Jul 2016 14:06:39 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks (depends on issue586) In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1469023599.96.0.107099442808.issue589@psf.upfronthosting.co.za> R David Murray added the comment: Hmm. Good question. We could use a specific user to create such issues. As for noise...we do typo issues now, so if we have an increased volume of them I think that just means we're fixing more typos. I don't really see the problem with that, since committing the PR will (if everything is working right) close the issue. Others may disagree, though. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 20 10:10:23 2016 From: metatracker at psf.upfronthosting.co.za (R David Murray) Date: Wed, 20 Jul 2016 14:10:23 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1469023823.11.0.844075802014.issue586@psf.upfronthosting.co.za> R David Murray added the comment: I anticipate that even if we improve our patch commit rate we'll still have 1000+ open PRs. I don't think pounding on github's infrastructure for every page render on our bug tracker is very friendly, not to mention probably not very performant on our end. Unless I'm misunderstanding something. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 20 10:46:08 2016 From: metatracker at psf.upfronthosting.co.za (Berker Peksag) Date: Wed, 20 Jul 2016 14:46:08 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1469025968.56.0.772075872643.issue586@psf.upfronthosting.co.za> Berker Peksag added the comment: The API call in my patch was just an example. GitHub does provide a search API. However, the problem with my approach is that it ignores rate limiting of GitHub API: https://api.github.com/rate_limit So Anish's patch might be more reliable than mine. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 20 13:09:34 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Wed, 20 Jul 2016 17:09:34 +0000 Subject: [Tracker-discuss] [issue587] Link GitHub pull requests in comments (depends on issue 586) In-Reply-To: <1468870442.58.0.0827952665631.issue587@psf.upfronthosting.co.za> Message-ID: <1469034574.94.0.487547016714.issue587@psf.upfronthosting.co.za> Anish Shah added the comment: I have updated the patch. :) _______________________________________________________ PSF Meta Tracker _______________________________________________________ -------------- next part -------------- diff --git a/extensions/local_replace.py b/extensions/local_replace.py index 1dd0e89..b05e3d4 100644 --- a/extensions/local_replace.py +++ b/extensions/local_replace.py @@ -111,6 +111,10 @@ substitutions = [ # if the issue number is too big the db will explode -- limit it to 7 digits issue_re = re.compile(r'(?P(\#|\b(?1?\d{1,6}))\b', re.I) +# PR number, pull request number, pullrequest number +pullrequest_re = re.compile(r'(?P(\b(?1?\d{1,6}))\b', + re.I) + class PyDevStringHTMLProperty(StringHTMLProperty): def _hyper_repl(self, match): @@ -142,6 +146,7 @@ class PyDevStringHTMLProperty(StringHTMLProperty): message = cre.sub(replacement, message) # finally add links for issues message = issue_re.sub(self._linkify_issue, message) + message = pullrequest_re.sub(self._linkify_pull_request, message) return message def _linkify_issue(self, match): @@ -165,6 +170,15 @@ class PyDevStringHTMLProperty(StringHTMLProperty): return template % dict(issue_id=issue_id, title=title, status=status, text=text) + def _linkify_pull_request(self, match): + """Turn a pullrequest (e.g. 'PR 123') to an HTML link""" + template = ('%(text)s') + pr_no = match.group('pr_no') + text = match.group('text') + base_url = 'https://github.com/python/cpython/pull/{}' + pr_url = base_url.format(pr_no) + return template % dict(link=pr_url, text=text) + noise_changes = re.compile('(nosy_count|message_count)\: \d+\.0( -> \d+\.0)?') diff --git a/extensions/test/local_replace_data.txt b/extensions/test/local_replace_data.txt index bdf1eb9..dbedc6c 100644 --- a/extensions/test/local_replace_data.txt +++ b/extensions/test/local_replace_data.txt @@ -234,3 +234,9 @@ see devguide/committing.html#using-several-working-copies see devguide/committing.html#using-several-working-copies see devguide/committing#using-several-working-copies see devguide/committing#using-several-working-copies +check my pullrequest 1000 on github +check my pullrequest 1000 on github +check my PR 1000 on github +check my PR 1000 on github +check my pull request 1000 on github +check my pull request 1000 on github From metatracker at psf.upfronthosting.co.za Wed Jul 20 13:49:10 2016 From: metatracker at psf.upfronthosting.co.za (Brett C.) Date: Wed, 20 Jul 2016 17:49:10 +0000 Subject: [Tracker-discuss] [issue589] Add GitHub PR to b.p.o issues using GitHub webhooks (depends on issue586) In-Reply-To: <1464035377.63.0.520552418309.issue589@psf.upfronthosting.co.za> Message-ID: <1469036950.8.0.117176080912.issue589@psf.upfronthosting.co.za> Brett C. added the comment: Another issue is that what happens if there is an issue, but the person simply forgot to include it? Now we have an extra issue that will need to have its superceder set and the issue closed. Eventually we could have a bot that automatically added a comment that either contained a link to the bpo issue or mentioned that no issue was specified (and how to fix it if there is one). But this isn't critical so I wouldn't prioritize its work. ---------- nosy: +brett.cannon _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Wed Jul 20 16:15:17 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Wed, 20 Jul 2016 20:15:17 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1469045717.33.0.121662019384.issue586@psf.upfronthosting.co.za> Maciej Szulik added the comment: Anish before accepting (if there are no other objections) there's still one issue. If I add a PR, remove it and re-add it I'm hitting the detector's "GitHub PR already added to an issue". Can you fix it, please? _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Thu Jul 21 02:02:18 2016 From: metatracker at psf.upfronthosting.co.za (Maciej Szulik) Date: Thu, 21 Jul 2016 06:02:18 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1469080938.38.0.88874208128.issue586@psf.upfronthosting.co.za> Maciej Szulik added the comment: Anish, actually there is one serious problem that grows from previous comment. Generally your current solution blocks adding single PR to multiple issues, because of the key. Generally, I'd advise you to drop the key entirely and do it similarly to how hgrepos are handled. In none of the next patches you're doing lookups, not anymore at least ;) If anything, you're going through PRs attached to specific issue and that is totally fine. That will also simplify the detector a bit at least, since you won't be searching for duplicates. I can't come up with something to fix the duplicates problem atm. I'll try to reach out to David and Berker later today and ask for their ideas. _______________________________________________________ PSF Meta Tracker _______________________________________________________ From metatracker at psf.upfronthosting.co.za Thu Jul 21 12:12:51 2016 From: metatracker at psf.upfronthosting.co.za (Anish Shah) Date: Thu, 21 Jul 2016 16:12:51 +0000 Subject: [Tracker-discuss] [issue586] Add GitHub Pull Request URL on issue page In-Reply-To: <1468311341.73.0.296282421587.issue586@psf.upfronthosting.co.za> Message-ID: <1469117571.84.0.202488741962.issue586@psf.upfronthosting.co.za> Anish Shah added the comment: I have updated the patch. I have removed pr_no field entirely. _______________________________________________________ PSF Meta Tracker _______________________________________________________ -------------- next part -------------- commit 299d794e5e7c58bb98358610d6a751079a89f8b4 Author: Anish Shah Date: Tue Jul 19 23:24:18 2016 +0530 Add GitHub Pull Request URL field on issues page diff --git a/detectors/pull_request.py b/detectors/pull_request.py new file mode 100644 index 0000000..3624232 --- /dev/null +++ b/detectors/pull_request.py @@ -0,0 +1,25 @@ +# Auditor for GitHub URLs +# Check if it is a valid GitHub Pull Request URL and extract PR number + +import re +import urlparse + + +def validate_github_url(db, cl, nodeid, newvalues): + url = newvalues.get('url', '') + if url == '': + return + parsed_url = urlparse.urlparse(url) + if parsed_url.scheme == '': + url = 'https://' + url + parsed_url = urlparse.urlparse(url) + if parsed_url.scheme not in ('http', 'https'): + raise ValueError("Invalid URL scheme in GitHub PR") + if 'github.com' not in parsed_url.netloc or 'pull' not in parsed_url.path: + raise ValueError("Invalid GitHub PR") + newvalues['url'] = parsed_url.geturl() + + +def init(db): + db.pull_request.audit('create', validate_github_url) + db.pull_request.audit('set', validate_github_url) diff --git a/html/issue.item.html b/html/issue.item.html index ddc4ec3..17eecd1 100644 --- a/html/issue.item.html +++ b/html/issue.item.html @@ -220,6 +220,14 @@ + + GitHub PR: + + + + + + @@ -273,6 +281,43 @@

+ + + + + + + + + + + + + + + + +
GitHub Pull Requests
Link Author Date Edit Remove
+ + GitHub PR link + + + creator's name + + creation date + + edit + +
+ + + +
+
+