Merge pull request #57 from timkpaine/setupaudit

fixes #55

.travis.yml

@@ -1,14 +1,35 @@
-language: python
+dist: xenial
+language: node_js
+node_js: "10"
+
 cache: 
   - pip
   - npm
 
-python:
-  - "3.6"
+matrix:
+  fast_finish: true
+  include:
+    - python: "3.7"
+      language: python
+      cache: pip
+
+    - cache: pip
+      os: osx
+      osx_image: xcode11.2
+
+addons:
+  homebrew:
+    update: true
+    packages:
+      - python
+
+before_install:
+  - nvm install 10.13.0 && nvm use 10.13.0
+  - npm install -g yarn
 
 install:
-    - pip install -r requirements.txt
-    - pip install -U pytest pytest-cov flake8 pylint codecov
+    - python3 -m pip install -e .[dev]
+    - python3 -m pip install -r requirements.txt
     - yarn
 
 script:

Makefile

@@ -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
@@ -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
@@ -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

setup.py

@@ -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',
     ],
 
@@ -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,