Skip to content

Assorted fixes required for CRAN submission - #1186

Merged
rpkyle merged 21 commits into
devfrom
757-generator-enhancements
May 4, 2020
Merged

Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom
757-generator-enhancements

Conversation

@rpkyle

@rpkylerpkyle commented Apr 9, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:

Specifically, two new YAML keys are supported in dash-info.yaml:

  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.

@rpkylerpkyle self-assigned this Apr 9, 2020
@rpkyle
rpkyle marked this pull request as ready for review April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet reviewed Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py Outdated
Marc-Andre-Rivet
Marc-Andre-Rivet reviewed Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py Outdated
Marc-Andre-Rivet
Marc-Andre-Rivet reviewed Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml Outdated
@rpkylerpkyle mentioned this pull request Apr 20, 2020
Merged
@Marc-Andre-Rivet

Marc-Andre-Rivet commented Apr 23, 2020•
edited by rpkyle
Loading

Copy link
Copy Markdown
Contributor

@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist

This PR Portions of this PR would be superseded by #1078.

@rpkylerpkyle changed the title WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle changed the base branch from dev to 481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle changed the title WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly deleted a comment from chriddypApr 30, 2020
@rpkyle

rpkyle commented May 1, 2020

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏

@rpkylerpkyle mentioned this pull request May 1, 2020
Closed
alexcjohnson
alexcjohnson reviewed May 1, 2020
View reviewed changes

@alexcjohnsonalexcjohnson left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?

Aside from that these changes look good to me!

@rpkyle

rpkyle commented May 2, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?

Aside from that these changes look good to me!

Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.

Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.

@rpkyle

rpkyle commented May 2, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?

fixed in ae28bac and bc903bc

@rpkyle

rpkyle commented May 3, 2020

Copy link
Copy Markdown
ContributorAuthor

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.

OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.

alexcjohnson
alexcjohnson approved these changes May 3, 2020
View reviewed changes

@alexcjohnsonalexcjohnson left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃

@rpkyle

rpkyle commented May 4, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃

@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).

I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.

@rpkyle
rpkyle changed the base branch from 481-arbitrary-extensions to devMay 4, 2020 15:04
@rpkyle
rpkyle merged commit fbb38c4 into devMay 4, 2020
@rpkyle
rpkyle deleted the 757-generator-enhancements branch May 4, 2020 15:16
rpkyle added a commit that referenced this pull request May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Assorted fixes required for CRAN submission by rpkyle · Pull Request #1186 · plotly/dash · GitHub
Skip to content
Assorted fixes required for CRAN submission - #1186
Merged
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
May 4, 2020
Merged
Assorted fixes required for CRAN submission#1186
rpkyle merged 21 commits into
devfrom 
757-generator-enhancements
Conversation
@rpkyle
@rpkylerpkyle
commented
Apr 9, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR proposes several enhancements and minor fixes in the R package generator, based on requests from CRAN maintainers:
Specifically, two new YAML keys are supported in dash-info.yaml:
  • pkg_copyright: when present, will add in a Copyright: line including the string value (see https://cran.r-project.org/web/packages/policies.html)
  • pkg_authors: when present, dash-generate-components will use this string as-is for Authors@R:, which CRAN prefers to Author: and Maintainer: elements within DESCRIPTION. When this string is not present, the generator will create it based on the author key within package.json, and assume that the author is the maintainer.
@rpkylerpkyle
self-assigned this
Apr 9, 2020
@rpkyle
rpkyle
marked this pull request as ready for review
April 9, 2020 19:41
Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment threaddash/development/_r_components_generation.py
Outdated

Marc-Andre-Rivet
Marc-Andre-Rivet
reviewed
Apr 9, 2020
View reviewed changes
Comment thread.circleci/config.yml
Outdated

@rpkylerpkyle
mentioned this pull request
Apr 20, 2020
 Merged

@Marc-Andre-Rivet
Marc-Andre-Rivet
commented
Apr 23, 2020•

edited by rpkyle

Loading

Copy link


Copy Markdown

Contributor
@rpkyle I think we should drop _asset_dist and just use _js_dist for now. While the _asset_dist is an interesting addition, I think we should rework css/js/asset in depth and with all Dash flavors in mind before committing to supporting additional props. _js_dist is not perfect but it covers all usages with _css_dist
This PR Portions of this PR would be superseded by #1078.
@rpkylerpkyle
changed the title
WC handling fixes & arbitrary extension support in R package generatorWC handling and line wrapping fixesApr 23, 2020
@rpkyle
rpkyle
changed the base branch from
dev
to
481-arbitrary-extensionsApril 23, 2020 23:37
@rpkylerpkyle
changed the title
WC handling and line wrapping fixesAssorted fixes required for CRAN submissionApr 30, 2020
@plotlyplotly
deleted a comment from chriddypApr 30, 2020
@rpkyle
rpkyle
commented
May 1, 2020

Copy link


Copy Markdown

ContributorAuthor
@alexcjohnson@Marc-Andre-Rivet This is ready for your review, and should resolve the CRAN maintainer concerns. I'd like to merge this today if possible, so Marc-André can use it for package builds starting with the upcoming Dash release. 🙏
@rpkylerpkyle
mentioned this pull request
May 1, 2020

Closed

alexcjohnson
alexcjohnson
reviewed
May 1, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces. Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
Aside from that these changes look good to me!
Sure, not entirely understanding what happened there, but the linter demanded more spaces, so I added them. 🤷‍♂️ I can try removing them, but if it fails the check I'll have to determine what led to the (new) warnings.
Will add the vim-generated swapfile, should probably .gitignore all .swp files, never any reason to commit them.
@rpkyle
rpkyle
commented
May 2, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Also there's a ._r_components_generation.py.swp file committed -> should be .gitignore'd?
fixed in ae28bac and bc903bc
@rpkyle
rpkyle
commented
May 3, 2020

Copy link


Copy Markdown

ContributorAuthor
💄 There are a bunch of places here the indentation is just changed from 4 to 8 spaces inside parens, either function args or if conditions - please put back the original 4 spaces.
OK, restored in 06dbc8d. Will try to sort out why that happened, might be a difference in configuration between pylint on my machine vs. CircleCI.
alexcjohnson
alexcjohnson
approved these changes
May 3, 2020
View reviewed changes
@alexcjohnsonalexcjohnson
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@rpkyle
rpkyle
commented
May 4, 2020•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
This PR should be retargeted to dev now that #1078 is merged, yes? Anyway after that and the Windows build is sorted out I think it's ready to go! 💃
@alexcjohnson I've taken your advice (thanks! 👏 ) on removing the spaces within the --r-suggests statement inside of package.json in plotly/dash-core-components, and the workaround enables the test to pass, but we still haven't sorted out why it fails (and we should).
I've opened https://github.com/plotly/dash-core/issues/184 in the meantime, and 019df65 will add back the spaces we have now omitted when necessary.
@rpkyle
rpkyle
changed the base branch from
481-arbitrary-extensions
to
devMay 4, 2020 15:04
@rpkyle
rpkyle
merged commit fbb38c4
into
devMay 4, 2020
@rpkyle
rpkyle
deleted the

757-generator-enhancements

branch
May 4, 2020 15:16
rpkyle added a commit
that referenced
this pull request
May 9, 2020
@rpkyleRyan Patrick Kyle
Assorted fixes required for CRAN submission (#1186)
28af8f7
* wrap descriptions at 60 chars
* fix wildcard handling
* support for non-CSS/JS deps in assets
* add value tag for .Rd files
* add copyright field to DESCRIPTION
* add Authors@R line to DESCRIPTION
* fix --r-suggests lstrip bug
* +sp after , if missing in R imp/sugg/deps
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@alexcjohnsonalexcjohnsonalexcjohnson approved these changes
@Marc-Andre-RivetMarc-Andre-RivetAwaiting requested review from Marc-Andre-Rivet

Assignees

@rpkylerpkyle

Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@rpkyle@Marc-Andre-Rivet@alexcjohnson