Skip to content

Commit ecc61b9

Browse files
authored
Merge pull request #5 from parente/jlab-1.0
Support JupyterLab 1.0
2 parents 6c54a59 + e23408a commit ecc61b9

File tree

12 files changed

+1408
-497
lines changed

12 files changed

+1408
-497
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,7 @@ generated/
9494
.vscode/
9595

9696
# Node
97-
node_modules/
97+
node_modules/
98+
99+
# Pipenv
100+
.venv/

Makefile

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
SHELL:=bash
22
PKG_SLUG:=jupyterlab-quickopen
33
PKG_NAME:=jupyterlab_quickopen
4-
CONDA_ENV:=jupyterlab-quickopen
54

65
help:
76
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
@@ -10,31 +9,30 @@ help:
109
clean: ## Make a clean source tree
1110
-find . -name '*.pyc' -exec rm -fv {} \;
1211
rm -rf $(PKG_NAME)/__pycache__ __pycache__
13-
rm -rf *.egg-info
14-
rm -rf node_modules
15-
rm -rf lib
16-
17-
activate: ## Make a conda activation command for eval
18-
@echo "source activate $(PKG_SLUG)"
19-
20-
conda-env: ## Make a conda development environment
21-
conda create -n $(PKG_SLUG) -c conda-forge python=3 \
22-
--file requirements.txt --file requirements-dev.txt
23-
source activate $(PKG_SLUG) && \
24-
jlpm install && \
25-
jupyter labextension install . --no-build
26-
source activate $(PKG_SLUG) && \
27-
pip install -e . && \
28-
jupyter serverextension enable $(PKG_NAME)
12+
rm -rf *.egg-info node_modules/ lib/ dist/
13+
14+
pipenv: ## Make a pipenv development environment
15+
pipenv --python 3.7
16+
PIPENV_VENV_IN_PROJECT=true pipenv sync --dev
17+
18+
shell: ## Make a pipenv shell
19+
pipenv shell
20+
21+
build: ## Make an install of the frontend and server extensions
22+
jlpm install
23+
jupyter labextension install . --no-build
24+
pip install -e .
25+
jupyter serverextension enable $(PKG_NAME)
2926

3027
release: ## Make a release on PyPI and npmjs.org
31-
source activate $(PKG_SLUG) && \
32-
python setup.py sdist && \
33-
twine upload dist/*.tar.gz
34-
source activate $(PKG_SLUG) && npm publish --access=public
28+
rm -rf dist/
29+
python setup.py sdist
30+
ls -l dist/
31+
twine upload dist/*.tar.gz
32+
npm publish --access=public
3533

3634
watch-lab: ## Make a JupyterLab build process watch for extension builds
37-
source activate $(PKG_SLUG) && jupyter lab --watch
35+
jupyter lab --watch
3836

3937
watch-src: ## Make a TypeScript build process watch for source changes
40-
source activate $(PKG_SLUG) && jlpm run watch
38+
jlpm run watch

Pipfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[[source]]
2+
name = "pypi"
3+
url = "https://pypi.org/simple"
4+
verify_ssl = true
5+
6+
[dev-packages]
7+
coverage = "*"
8+
flake8 = "*"
9+
pytest = "*"
10+
twine = "*"
11+
12+
[packages]
13+
jupyterlab = ">=1.0,<2.0a"
14+
notebook = ">=5.2,<6.0a"
15+
16+
[requires]
17+
python_version = "3.7"

0 commit comments

Comments
 (0)