Skip to content

Commit

Permalink
fixes #55
Browse files Browse the repository at this point in the history
  • Loading branch information
timkpaine committed Nov 19, 2019
1 parent a862b9c commit 1b07f36
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ python:
- "3.6"

install:
- pip install -e .[dev]
- pip install -r requirements.txt
- pip install -U pytest pytest-cov flake8 pylint codecov
- python2
- yarn

script:
Expand Down
16 changes: 11 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
PYTHON=python3

testjs: ## Clean and Make js tests
yarn test

testpy: ## Clean and Make unit tests
python3 -m pytest -v tests --cov=jupyterlab_templates
${PYTHON} -m pytest -v tests --cov=jupyterlab_templates

test: lint ## run the tests for travis CI
@ python3 -m pytest -v tests --cov=jupyterlab_templates
@ ${PYTHON} -m pytest -v tests --cov=jupyterlab_templates
yarn test

lint: ## run linter
Expand All @@ -25,11 +27,15 @@ clean: ## clean the repository
rm -rf .coverage cover htmlcov logs build dist *.egg-info lib node_modules

install: ## install to site-packages
pip3 install .
${PYTHON} -m pip install .

serverextension: install ## enable serverextension
jupyter serverextension enable --py jupyterlab_templates

fix: ## run autopep8/tslint fix
autopep8 --in-place -r -a -a crowdsource/
./node_modules/.bin/tslint --fix src/ts/**/*.ts

js: ## build javascript
yarn
yarn build
Expand All @@ -39,8 +45,8 @@ labextension: js ## enable labextension

dist: js ## dist to pypi
rm -rf dist build
python3 setup.py sdist
python3 setup.py bdist_wheel
${PYTHON} setup.py sdist
${PYTHON} setup.py bdist_wheel
twine check dist/* && twine upload dist/*

# Thanks to Francoise at marmelab.com for this
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Framework :: Jupyter',
],

Expand All @@ -73,7 +71,7 @@
packages=find_packages(exclude=['tests', ]),
install_requires=requires,
extras_require={
'dev': ['pytest', 'pytest-cov', 'pylint', 'flake8', 'bumpversion']
'dev': ['autopep8', 'pytest', 'pytest-cov>=2.6.1', 'flake8', 'bumpversion', 'mock']
},
include_package_data=True,
zip_safe=False,
Expand Down

0 comments on commit 1b07f36

Please sign in to comment.