Skip to content

Commit c79ac4c

Browse files
committed
Refactor to use lerna
1 parent d16e150 commit c79ac4c

File tree

19 files changed

+54
-23
lines changed

19 files changed

+54
-23
lines changed

{{cookiecutter.github_project_name}}/.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
cache:
1515
pip: true
1616
directories:
17-
- {{ cookiecutter.python_package_name }}/jlextension/node_modules # NPM packages
17+
- {{ cookiecutter.python_package_name }}/jlextension/node_modules # NPM packages
1818
- ts/node_modules # NPM packages
1919
- $HOME/.npm
2020
before_install:
@@ -47,15 +47,14 @@ script:
4747
- |
4848
if [[ $GROUP == python ]]; then
4949
pushd $(mktemp -d)
50-
py.test -l --cov-report xml:$TRAVIS_BUILD_DIR/coverage.xml --cov={{ cookiecutter.python_package_name }} --pyargs {{ cookiecutter.python_package_name }}
50+
py.test -l --cov-report xml:$TRAVIS_BUILD_DIR/coverage.xml --cov={{ cookiecutter.python_package_name }} --pyargs {{ cookiecutter.python_package_name }}
51+
popd
5152
elif [[ $GROUP == js ]]; then
52-
pushd ts
5353
npm test
5454
fi
5555
before_cache:
5656
# Do not cache our own package
5757
- |
58-
popd
59-
rm -rf {{ cookiecutter.python_package_name }}/jlextension/node_modules/{{ cookiecutter.npm_package_name }}
58+
rm -rf packages/{{ cookiecutter.jlab_extension_name }}/node_modules/{{ cookiecutter.npm_package_name }}
6059
after_success:
6160
- codecov
Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
include LICENSE.md
1+
include LICENSE.txt
22
include README.md
33

44
include setupbase.py
55
include pytest.ini
6+
include .coverage.rc
7+
8+
include package.json
9+
include lerna.json
610

711
# Documentation
812
graft docs
@@ -15,18 +19,17 @@ prune docs/dist
1519
graft examples
1620

1721
# Javascript files
18-
graft {{ cookiecutter.python_package_name }}/nbextension
19-
graft ts
20-
prune ts/node_modules
21-
prune ts/coverage
22-
prune ts/lib
23-
prune ts/test/build
22+
graft {{ cookiecutter.python_package_name }}/nbextension
23+
graft packages
24+
prune packages/**/node_modules
25+
prune packages/**/coverage
26+
prune packages/**/node_modules
27+
prune packages/**/lib
28+
prune packages/**/test/build
2429

2530
# Patterns to exclude from any directory
2631
global-exclude *~
2732
global-exclude *.pyc
2833
global-exclude *.pyo
29-
global-exclude node_modules
30-
global-exclude __pycache__
3134
global-exclude .git
3235
global-exclude .ipynb_checkpoints
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"lerna": "2.0.0-rc.5",
3+
"packages": [
4+
"packages/*"
5+
],
6+
"version": "independent"
7+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"private": true,
3+
"scripts": {
4+
"install": "lerna bootstrap --hoist",
5+
"clean": "lerna run clean",
6+
"build": "lerna run build",
7+
"updated": "lerna updated",
8+
"test": "lerna run test",
9+
"publish": "npm run clean && npm run build && lerna publish -m \"Publish npm packages\""
10+
},
11+
"devDependencies": {
12+
"lerna": "^2.0.0"
13+
}
14+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.DS_Store
2+
node_modules/
3+
tests/
4+
.jshintrc

{{cookiecutter.github_project_name}}/{{cookiecutter.python_package_name}}/jlextension/package.json renamed to {{cookiecutter.github_project_name}}/packages/{{ cookiecutter.jlab_extension_name }}/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@jupyterlab/application": "~0.9.0",
99
"@phosphor/coreutils": "~1.3.0",
1010
"@jupyter-widgets/jupyterlab-manager": "~0.25.11",
11-
"{{ cookiecutter.npm_package_name }}": "file:../../ts"
11+
"{{ cookiecutter.npm_package_name }}": "{{ cookiecutter.npm_package_name }}"
1212
},
1313
"devDependencies": {
1414
"rimraf": "^2.6.1",
@@ -26,7 +26,6 @@
2626
"scripts": {
2727
"clean": "rimraf build",
2828
"build": "tsc --project src",
29-
"update": "rimraf node_modules/{{ cookiecutter.npm_package_name }} && npm install ../../ts && npm run build",
3029
"prepublish": "npm run clean && npm run build"
3130
},
3231
"files": [
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.DS_Store
2+
node_modules/
3+
tests/
4+
.jshintrc

{{cookiecutter.github_project_name}}/ts/package.json renamed to {{cookiecutter.github_project_name}}/packages/{{ cookiecutter.npm_package_name }}/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",
77
"scripts": {
8+
"clean:lib": "rimraf lib",
9+
"clean:nbextension": "rimraf ../../{{ cookiecutter.python_package_name }}/nbextension/static/index.js",
10+
"clean": "npm run clean:lib && npm run clean:nbextension",
811
"build:nbextension": "webpack",
912
"build:lib": "tsc --project src",
1013
"build": "npm run build:lib && npm run build:nbextension",
1114
"test": "npm run test:firefox",
1215
"test:chrome": "karma start --browsers=Chrome tests/karma.conf.js",
1316
"test:debug": "karma start --browsers=Chrome --singleRun=false --debug=true tests/karma.conf.js",
1417
"test:firefox": "karma start --browsers=Firefox tests/karma.conf.js",
15-
"test:ie": "karma start --browsers=IE tests/karma.conf.js"
18+
"test:ie": "karma start --browsers=IE tests/karma.conf.js",
19+
"prepublish": "npm run clean && npm run build"
1620
},
1721
"keywords": [
1822
"jupyter",

0 commit comments

Comments
 (0)