CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164

Merged
jonmmease merged 28 commits into
masterfrom
conda_doc_ci_updates
Apr 23, 2021
Merged

CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom
conda_doc_ci_updates

Conversation

@jonmmease

@jonmmeasejonmmease commented Apr 22, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.

  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.

Not done:

  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.

@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed the conda_doc_ci_updates branch from f919ad6 to ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease changed the title WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten

nicolaskruchten commented Apr 23, 2021

Copy link
Copy Markdown
Contributor

This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?

@jonmmease

jonmmease commented Apr 23, 2021

Copy link
Copy Markdown
ContributorAuthor

I'm curious about why the orca build is on 3.8?

It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.

@nicolaskruchten

nicolaskruchten commented Apr 23, 2021

Copy link
Copy Markdown
Contributor

No need, just curious. 💃

Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)

@nicolaskruchten

nicolaskruchten commented Apr 23, 2021

Copy link
Copy Markdown
Contributor

We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.

@jonmmease
jonmmease merged commit f18576b into masterApr 23, 2021
@jonmmease
jonmmease deleted the conda_doc_ci_updates branch April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten

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

Skip to content
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication - #3164
Merged
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Apr 23, 2021
Merged
CircleCI updates: Unify requirements, drop conda, refactor to reduce duplication#3164
jonmmease merged 28 commits into
masterfrom 
conda_doc_ci_updates
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 22, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR is a follow-on to #3160 that inlcudes a bit more cleanup to the CI/CD architecture.
  • Previously, the orca test job used conda to install orca and the other python dependencies, and the python dependencies were not the same as those used in the optional environment. Now, the orca tests use an identical environment to the optional tests, and they install orca using npm (no more conda).
  • Previously the percy tests used an environment configured with a custom set of python dependencies that didn't match anything else. Now it uses the same optional requirements.txt file as optional.
  • I updated the circleci configuration to version 2.1, and refactored it to use commands and parameters (https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration) to significantly reduce configuration duplication.
Not done:
  • This PR does not unify the requirements of the documentation build with the other CI test jobs. I played with it a little bit, but ran into some documentation build failures and so I decided not to lump that into this PR.
@jonmmease
Remove miniconda2 installation branch
46e06e8
@jonmmease
Install requirements for orca test from same requirements.txt file
37628c9
@jonmmease
disable non-orca tests temporarily
6b19e1e
@jonmmease
disable dev-build
513251f
@jonmmease
Use same circleci image for orca job as optional jobs
28b3349
@jonmmease
remove editable plotly-geo from optional requirements.txt
56eb217
Try install orca with npm and test with optional
@jonmmease
Fix orca test path
8c7c3c6
@jonmmease
Install poppler
b0b2367
@jonmmease
store failed images as artifacts
0b390fb
@jonmmease
Update orca image baselines
30420e8
@jonmmease
Try global npm install
ec4911c
@jonmmease
Try again with orca install from npm
1f6b2fb
@jonmmease
try orca path fix
0729420
@jonmmease
baseline
8141262
@jonmmease
Revert "baseline"
273835e
This reverts commit 8141262
@jonmmease
Specify orca engine explicitly
d9197f8
@jonmmease
blacken
31228a7
@jonmmease
baselines
18ff7d9
@jonmmease
reduce duplication with circleci commands
665b78d
@jonmmease
stay with .circleci version 2
f5053a7
@jonmmease
use underscores for command names
64f3b15
@jonmmease
Update to 2.1
0a46829
@jonmmease
Fix optional command
dd9db8d
@jonmmease
Use optional requirements.txt from percy CI job
e1e5421
@jonmmease
Split optional and orca commands
738a1dc
@jonmmease
Re-enable all CI tests
ca7bb77
@jonmmease
jonmmeaseforce-pushed
the
conda_doc_ci_updates
branch
from
f919ad6 to
ca7bb77CompareApril 22, 2021 17:28
@jonmmeasejonmmease
changed the title
WIP: Conda doc ci updatesCircleCI updates: Unify requirements, drop conda, refactor to reduce duplicationApr 22, 2021
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
This looks really great, thank you! I'm curious about why the orca build is on 3.8? Has it always been that way?
@jonmmease
jonmmease
commented
Apr 23, 2021

Copy link


Copy Markdown

ContributorAuthor
I'm curious about why the orca build is on 3.8?
It was 3.7 before. No particular reason for the change, and happy to switch it back to 3.7.
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
No need, just curious. 💃
Re the docs build, we can probably deal with that another day... the current set of improvements is already huge IMO :)
@nicolaskruchten
nicolaskruchten
commented
Apr 23, 2021

Copy link


Copy Markdown

Contributor
We're probably losing a little bit of configuration-diversity in terms of what we're testing on a regular basis, but we're gaining in reliability and maintainability, which is a good tradeoff ATM IMO.
@jonmmease
jonmmease
merged commit f18576b
into
masterApr 23, 2021
@jonmmease
jonmmease
deleted the

conda_doc_ci_updates

branch
April 23, 2021 13:40
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@nicolaskruchtennicolaskruchtenAwaiting requested review from nicolaskruchten

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@nicolaskruchten