Skip to content

Commit a164302

Browse files
richvdhrichvdh
authored
Get rid of the proprosal-in-review label (#1036)
Everything is in review. We may as well just use the draft state for WIP stuff.
1 parent 39d472f commit a164302

File tree

2 files changed

+30
-23
lines changed

2 files changed

+30
-23
lines changed

‎content/proposals.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,17 @@ pull request trackers.
332332

333333
| Name | GitHub Label | Description |
334334
|---------------------------------|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
335-
| Proposal Drafting and Feedback | [No label](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+-label%3Aabandoned+-label%3Afinal-comment-period+-label%3Afinished-final-comment-period+-label%3Amerged+-label%3Aobsolete+-label%3Aproposal-postponed+-label%3Aproposed-final-comment-period+-label%3Aproposal-in-review+-label%3Aspec-pr-in-review+-label%3Aspec-pr-missing) | A proposal document which is still work-in-progress but is being shared to incorporate feedback. Please prefix your proposal's title with `[WIP]` to make it easier for reviewers to skim their notifications list. |
336-
| Proposal In Review | [proposal-in-review](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aproposal-in-review) | A proposal document which is now ready and waiting for review by the Spec Core Team and community |
337-
| Proposed Final Comment Period | [proposed-final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aproposed-final-comment-period+) | Currently awaiting signoff of a 75% majority of team members in order to enter the final comment period |
338-
| Final Comment Period | [final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Afinal-comment-period+) | A proposal document which has reached final comment period either for merge, closure or postponement |
339-
| Final Comment Period Complete | [finished-final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Afinished-final-comment-period+) | The final comment period has been completed. Waiting for a demonstration implementation |
340-
| Spec PR Missing | [spec-pr-missing](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aspec-pr-missing) | The proposal has been agreed, and proven with a demonstration implementation. Waiting for a PR against the Spec |
341-
| Spec PR In Review | [spec-pr-in-review](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aspec-pr-in-review+) | The spec PR has been written, and is currently under review |
342-
| Spec PR Merged | [merged](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Amerged) | A proposal with a sufficient working implementation and whose Spec PR has been merged! |
343-
| Postponed | [proposal-postponed](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aproposal-postponed+) | A proposal that is temporarily blocked or a feature that may not be useful currently but perhaps sometime in the future |
344-
| Abandoned | [abandoned](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aabandoned) | A proposal where the author/shepherd is not responsive |
345-
| Obsolete | [obsolete](https://github.com/matrix-org/matrix-spec-proposals/issues?q=label%3Aproposal+label%3Aobsolete+) | A proposal which has been made obsolete by another proposal or decision elsewhere. |
335+
| Proposal Drafting and Feedback | [Draft pull request](https://github.com/matrix-org/matrix-spec-proposals/issues?q=is:open+draft:true) | A proposal document which is still work-in-progress but is being shared to incorporate feedback. Please prefix your proposal's title with `[WIP]` to make it easier for reviewers to skim their notifications list. |
336+
| Proposal In Review | [No label](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+-label%3Aabandoned+-label%3Afinal-comment-period+-label%3Afinished-final-comment-period+-label%3Amerged+-label%3Aobsolete+-label%3Aproposal-postponed+-label%3Aproposed-final-comment-period+-label%3Aproposal-in-review+-label%3Aspec-pr-in-review+-label%3Aspec-pr-missing) | A proposal document which is now ready and waiting for review by the Spec Core Team and community |
337+
| Proposed Final Comment Period | [proposed-final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aproposed-final-comment-period+) | Currently awaiting signoff of a 75% majority of team members in order to enter the final comment period |
338+
| Final Comment Period | [final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Afinal-comment-period+) | A proposal document which has reached final comment period either for merge, closure or postponement |
339+
| Final Comment Period Complete | [finished-final-comment-period](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Afinished-final-comment-period+) | The final comment period has been completed. Waiting for a demonstration implementation |
340+
| Spec PR Missing | [spec-pr-missing](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aspec-pr-missing) | The proposal has been agreed, and proven with a demonstration implementation. Waiting for a PR against the Spec |
341+
| Spec PR In Review | [spec-pr-in-review](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aspec-pr-in-review+) | The spec PR has been written, and is currently under review |
342+
| Spec PR Merged | [merged](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Amerged) | A proposal with a sufficient working implementation and whose Spec PR has been merged! |
343+
| Postponed | [proposal-postponed](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aproposal-postponed+) | A proposal that is temporarily blocked or a feature that may not be useful currently but perhaps sometime in the future |
344+
| Abandoned | [abandoned](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aabandoned) | A proposal where the author/shepherd is not responsive |
345+
| Obsolete | [obsolete](https://github.com/matrix-org/matrix-spec-proposals/issues?q=draft:false+label%3Aproposal+label%3Aobsolete+) | A proposal which has been made obsolete by another proposal or decision elsewhere. |
346346

347347
## Categories
348348

‎scripts/proposals.js‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ const outputDir = path.join(__dirname, "../data/msc");
2929
* - `title`: used for things like headings in renderings of the proposals
3030
*/
3131
const states = [
32-
{
33-
label: "proposal-in-review",
34-
title: "Proposal In Review"
35-
},
3632
{
3733
label: "proposed-final-comment-period",
3834
title: "Proposed Final Comment Period"
@@ -188,23 +184,34 @@ function processIssues() {
188184
fs.mkdirSync(outputDir);
189185
}
190186
const output = [];
191-
// make a group of "work in progress" proposals,
192-
// which are identified by not having any of the state labels
187+
188+
// make a group of "work in progress" proposals, for those in draft.
189+
output.push({
190+
title: "Work In Progress",
191+
label: "work-in-progress",
192+
proposals: issues
193+
.filter(issue => issue.state == "open" && issue.draft)
194+
.map(issue => getProposalFromIssue(issue))
195+
});
196+
197+
// now the 'Proposal In Review' section, which are identified by
198+
// not having any of the state labels
193199
const stateLabels = states.map(s => s.label);
194-
const worksInProgress = issues.filter(issue => {
200+
const proposalsInReview = issues.filter(issue => {
195201
const labelsForIssue = issue.labels.map(l => l.name);
196-
return intersection(labelsForIssue, stateLabels).length === 0;
202+
return !issue.draft && intersection(labelsForIssue, stateLabels).length === 0;
197203
});
198204
output.push({
199-
title: "Work In Progress",
200-
label: "work-in-progress",
201-
proposals: worksInProgress.map(issue => getProposalFromIssue(issue))
205+
title: "Proposal In Review",
206+
label: "proposal-in-review",
207+
proposals: proposalsInReview.map(issue => getProposalFromIssue(issue))
202208
});
209+
203210
// for each defined state
204211
for (const state of states) {
205212
// get the set of issues for that state
206213
const issuesForState = issues.filter(msc => {
207-
return msc.labels.some(l => l.name === state.label);
214+
return !msc.draft && msc.labels.some(l => l.name === state.label);
208215
});
209216
// store it in /data
210217
output.push({

0 commit comments

Comments
 (0)