Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not fail on deduplicate and ignore optional #7013

Merged
merged 1 commit into from Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildutils/src/update-core-mode.ts
Expand Up @@ -39,7 +39,7 @@ utils.writePackageData(path.join(staging, 'package.json'), data);
fs.removeSync(path.join(staging, 'yarn.lock'));
utils.run('jlpm', { cwd: staging });
try {
utils.run('jlpm yarn-deduplicate -s fewer --fail', { cwd: staging });
utils.run('jlpm yarn-deduplicate -s fewer', { cwd: staging });
} catch {
// re-run install if we deduped packages!
utils.run('jlpm', { cwd: staging });
Expand Down
2 changes: 1 addition & 1 deletion jupyterlab/commands.py
Expand Up @@ -163,7 +163,7 @@ def dedupe_yarn(path, logger=None):
pins above, for example, known-bad versions
"""
had_dupes = ProgressProcess(
['node', YARN_PATH, 'yarn-deduplicate', '-s', 'fewer', '--fail'],
['node', YARN_PATH, 'yarn-deduplicate', '-s', 'fewer'],
cwd=path, logger=logger
).wait() != 0

Expand Down
1 change: 1 addition & 0 deletions jupyterlab/staging/.yarnrc
@@ -1 +1,2 @@
yarn-path "./yarn.js"
ignore-optional true
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -50,7 +50,7 @@
"create:package": "node buildutils/lib/create-package.js",
"create:test": "node buildutils/lib/create-test-package.js",
"create:theme": "node buildutils/lib/create-theme.js",
"deduplicate": "jlpm yarn-deduplicate -s fewer --fail",
"deduplicate": "jlpm yarn-deduplicate -s fewer",
"docs": "lerna run docs",
"eslint": "eslint --fix .",
"eslint:check": "eslint .",
Expand Down