Skip to content

Commit ace5c70

Browse files
committed
conda -> pipenv, jlab 1.0 update
1 parent 6c54a59 commit ace5c70

File tree

5 files changed

+1289
-348
lines changed

5 files changed

+1289
-348
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: 16 additions & 18 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
@@ -14,27 +13,26 @@ clean: ## Make a clean source tree
1413
rm -rf node_modules
1514
rm -rf lib
1615

17-
activate: ## Make a conda activation command for eval
18-
@echo "source activate $(PKG_SLUG)"
16+
pipenv: ## Make a pipenv development environment
17+
pipenv --python 3.7
18+
PIPENV_VENV_IN_PROJECT=true pipenv sync --dev
1919

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)
20+
shell: ## Make a pipenv shell
21+
pipenv shell
22+
23+
build: ## Make an install of the frontend and server extensions
24+
jlpm install
25+
jupyter labextension install . --no-build
26+
pip install -e .
27+
jupyter serverextension enable $(PKG_NAME)
2928

3029
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
30+
python setup.py sdist
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)