Merge branch 'update-mocha'

noyainrain · noyainrain · commit 99b873d8e694 · 2017-11-01T14:48:17.000+01:00
diff --git a/boilerplate/client/.gitignore b/boilerplate/client/.gitignore
@@ -1,2 +1 @@
-package-lock.json
 /node_modules
diff --git a/boilerplate/client/package.json b/boilerplate/client/package.json
@@ -2,15 +2,15 @@
     "scripts": {
         "test-ui": "mocha '!(node_modules)/**/ui_test*.js'",
         "lint": "eslint .",
-        "clean": "rm -rf package-lock.json node_modules"
+        "clean": "rm -rf node_modules"
     },
     "dependencies": {
-        "@noyainrain/micro": "^0.1",
+        "@noyainrain/micro": "^0.1"
     },
     "devDependencies": {
         "eslint": "^4.0",
         "eslint-config-eslint": "^4.0",
-        "mocha": "^3.4"
+        "mocha": "^4.0"
     },
     "private": true
 }
diff --git a/boilerplate/requirements.txt b/boilerplate/requirements.txt
@@ -1 +1 @@
-git+https://github.com/noyainrain/micro.git@0.1.0
+git+https://github.com/noyainrain/micro.git@0.1.1
diff --git a/client/.gitignore b/client/.gitignore
@@ -1,2 +1 @@
-package-lock.json
 /node_modules
diff --git a/client/package.json b/client/package.json
@@ -1,12 +1,12 @@
 {
     "name": "@noyainrain/micro",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Toolkit for social micro web apps.",
     "repository": "noyainrain/micro",
     "license": "LGPL-3.0",
     "scripts": {
         "lint": "eslint .",
-        "clean": "rm -rf package-lock.json node_modules"
+        "clean": "rm -rf node_modules"
     },
     "dependencies": {
         "whatwg-fetch": "^2.0",
diff --git a/hello/.gitignore b/hello/.gitignore
@@ -1,2 +1 @@
-package-lock.json
 /node_modules
diff --git a/hello/package.json b/hello/package.json
@@ -3,7 +3,7 @@
         "link-micro": "mkdir -p node_modules/@noyainrain/micro && cp -l ../client/*.* node_modules/@noyainrain/micro",
         "test-ui": "mocha ui_test.js",
         "lint": "eslint .",
-        "clean": "rm -rf package-lock.json node_modules"
+        "clean": "rm -rf node_modules"
     },
     "dependencies": {
         "whatwg-fetch": "^2.0",
@@ -15,7 +15,7 @@
     "devDependencies": {
         "eslint": "^4.0",
         "eslint-config-eslint": "^4.0",
-        "mocha": "^3.4"
+        "mocha": "^4.0"
     },
     "private": true
 }
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='micro',
-    version='0.1.0',
+    version='0.1.1',
     url='https://github.com/noyainrain/micro',
     maintainer='Sven James',
     maintainer_email='sven.jms AT gmail.com',

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-git+https://github.com/noyainrain/[email protected].0`
	`1`	`+git+https://github.com/noyainrain/[email protected].1`