Merge branch 'master' into gulp-v4

mvillis · Jan 10, 2018 · 2f22182 · 2f22182
2 parents d9a0de0 + 92f76f9
commit 2f22182
Show file tree

Hide file tree

Showing 19 changed files with 3,093 additions and 1,822 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1 +1,6 @@
-{ "presets": ["es2015", "react"] }
+{ "presets": [
+    [ "env", {
+	"useBuiltIns": "entry"
+    } ],
+    "react"
+] }
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,8 @@ docs/_build/
 
 # Virtual env
 .venv*
+
+# runtime files
+backup/
+log/
+*.pid
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ install:
   - npm --version
   - npm install -g yarn
   - yarn --version
-  - yarn global add gulp-cli
+  - npm install -g gulp-cli
   - yarn install --production
   - gulp --version
   - gulp build --production

diff --git a/client/css/tablesort.css b/client/css/tablesort.css
@@ -13,6 +13,7 @@ th[role=columnheader]:not(.no-sort)::after {
   opacity: 0;
   -webkit-user-select: none;
   -moz-user-select: none;
+  -ms-user-select: none;
   user-select: none;
 }
 

diff --git a/client/js/components/common/announcements.js b/client/js/components/common/announcements.js
@@ -42,7 +42,7 @@ var Announcements = createReactClass({
   render: function () {
     return (
       <Accordion>
-        { this.state.announcements.map(function (announcement) {
+        {this.state.announcements.map(function (announcement) {
           return <Panel bsStyle={announcement.style} header={announcement.title} key={announcement.id}>
             <ReactMarkdown escapeHtml source={announcement.content} />
           </Panel>

diff --git a/measure_mate/models.py b/measure_mate/models.py
@@ -175,9 +175,9 @@ class Meta(object):
         ('default', 'Default'),
         ('primary', 'Primary'),
         ('success', 'Success'),
-        ('info',    'Success'),
+        ('info', 'Success'),
         ('warning', 'Warning'),
-        ('danger',  'Danger'),
+        ('danger', 'Danger'),
     )
 
     id = models.AutoField(primary_key=True)

diff --git a/measure_mate/settings/base.py b/measure_mate/settings/base.py
@@ -71,7 +71,7 @@
         'rest_framework.permissions.AllowAny',
     ),
     'DEFAULT_FILTER_BACKENDS': (
-        'rest_framework.filters.DjangoFilterBackend',
+        'django_filters.rest_framework.DjangoFilterBackend',
     ),
     'COMPACT_JSON': True
 }

diff --git a/measure_mate/tests/models/test_announcements.py b/measure_mate/tests/models/test_announcements.py
@@ -8,4 +8,4 @@ class AnnouncementTestCases(TestCase):
     def test_str_title_announcement(self):
         announcement = AnnouncementFactory()
         announcement.clean()
-        self.assertEqual(announcement.title, str(announcement))
+        self.assertEqual(announcement.title, str(announcement))
diff --git a/measure_mate/tests/models/test_assessment.py b/measure_mate/tests/models/test_assessment.py
@@ -16,4 +16,4 @@ def test_creation_of_assessment(self):
     def test_ordering_of_assessments(self):
         assessment1 = AssessmentFactory()
         assessment2 = AssessmentFactory()
-        self.assertEqual(assessment2, Assessment.objects.first())
+        self.assertEqual(assessment2, Assessment.objects.first())
diff --git a/measure_mate/tests/models/test_attribute.py b/measure_mate/tests/models/test_attribute.py
@@ -9,4 +9,4 @@ def test_creation_of_attribute(self):
         template = TemplateFactory()
         attribute = AttributeFactory(template=template)
         attribute.clean()
-        self.assertEqual("%s - %s" % (template.name, attribute.name), str(attribute))
+        self.assertEqual("%s - %s" % (template.name, attribute.name), str(attribute))
diff --git a/measure_mate/tests/models/test_rating.py b/measure_mate/tests/models/test_rating.py
@@ -10,4 +10,4 @@ def test_creation_of_rating(self):
         attribute = AttributeFactory(template=template)
         rating = RatingFactory(attribute=attribute, rank=1)
         rating.clean()
-        self.assertEqual("%s - %s - %s" % (template.name, attribute.name, rating.name), str(rating))
+        self.assertEqual("%s - %s - %s" % (template.name, attribute.name, rating.name), str(rating))
diff --git a/measure_mate/tests/models/test_tags.py b/measure_mate/tests/models/test_tags.py
@@ -8,4 +8,4 @@ class TagTestCases(TestCase):
     def test_str_name_tag(self):
         tag = TagFactory()
         tag.clean()
-        self.assertEqual(tag.name, str(tag))
+        self.assertEqual(tag.name, str(tag))
diff --git a/measure_mate/tests/models/test_team.py b/measure_mate/tests/models/test_team.py
@@ -15,4 +15,4 @@ def test_creation_of_team_with_two_tags(self):
         tag2 = TagFactory()
         team = TeamFactory(tags=(tag1, tag2))
         team.clean()
-        self.assertEqual(2, len(team.tags.all()))
+        self.assertEqual(2, len(team.tags.all()))
diff --git a/measure_mate/tests/models/test_template.py b/measure_mate/tests/models/test_template.py
@@ -8,4 +8,4 @@ class TemplateTestCases(TestCase):
     def test_has_up_to_five_in_running_set(self):
         template = TemplateFactory()
         template.clean()
-        self.assertEqual(template.name, str(template))
+        self.assertEqual(template.name, str(template))
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "main": "./client/index.js",
   "engines": {
-    "node": ">=6.9.1 <7.0.0",
+    "node": ">=6.9.1",
     "npm": ">3.0.0",
     "yarn": ">0.20.3"
   },
@@ -30,75 +30,78 @@
   },
   "dependencies": {
     "babel-plugin-transform-react-jsx-self": "^6.11.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
-    "babelify": "^7.3.0",
+    "babelify": "^8.0.0",
     "bootstrap": "^3.3.7",
-    "browserify": "^14.1.0",
-    "create-react-class": "^15.6.0",
-    "gulp": "github:gulpjs/gulp#4.0",
+    "browserify": "^15.0.0",
+    "create-react-class": "^15.6.2",
+    "gulp": "^4.0.0",
     "gulp-concat": "^2.6.1",
     "gulp-notify": "^3.0.0",
-    "gulp-sourcemaps": "^2.6.0",
+    "gulp-sourcemaps": "^2.6.1",
     "gulp-uglify": "^3.0.0",
     "gulp-uglifycss": "^1.0.8",
     "gulp-util": "^3.0.8",
-    "history": "^4.6.3",
-    "http-status-codes": "^1.0.6",
+    "history": "^4.7.2",
+    "http-status-codes": "^1.3.0",
     "jquery": "^3.2.1",
     "lodash": "^4.17.4",
-    "moment": "^2.18.1",
-    "plotly.js": "^1.28.3",
-    "prop-types": "^15.5.10",
-    "react": "^15.6.1",
+    "moment": "^2.19.1",
+    "plotly.js": "^1.31.1",
+    "prop-types": "^15.6.0",
+    "react": "^15.6.2",
     "react-bootstrap": "^0.31.1",
-    "react-dom": "^15.6.1",
-    "react-input-autosize": "^1.1.4",
+    "react-dom": "^15.6.2",
+    "react-input-autosize": "^2.0.1",
     "react-loader": "^2.4.2",
     "react-markdown": "^2.5.0",
-    "react-overlays": "^0.7.0",
+    "react-overlays": "^0.8.1",
     "react-prop-types": "^0.4.0",
     "react-redirect": "^1.0.0",
-    "react-router": "^3.0.5",
+    "react-router": "3.2.0",
     "react-router-bootstrap": "^0.23.3",
-    "react-select": "^1.0.0-rc.5",
+    "react-select": "^1.0.0-rc.10",
     "require-dir": "^0.3.1",
-    "semver": "^5.3.0",
-    "snyk": "^1.36.2",
+    "semver": "^5.4.1",
+    "snyk": "^1.45.0",
     "tablesort": "^5.0.0",
     "through2": "^2.0.3",
     "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0",
-    "yargs": "^8.0.2"
+    "vinyl-source-stream": "^2.0.0",
+    "yargs": "^10.1.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-register": "^6.24.1",
-    "browser-sync": "^2.18.12",
-    "chai": "^4.1.0",
-    "coveralls": "^2.13.1",
+    "babel-cli": "^6.26.0",
+    "babel-register": "^6.26.0",
+    "browser-sync": "^2.18.13",
+    "chai": "^4.1.1",
+    "coveralls": "^3.0.0",
     "enzyme": "^2.9.1",
-    "eslint": "^4.2.0",
-    "eslint-config-standard": "^10.2.1",
+    "eslint": "^4.9.0",
+    "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-config-standard-jsx": "^4.0.1",
     "eslint-config-standard-react": "^5.0.0",
-    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-react": "^7.0.1",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-standard": "^3.0.1",
-    "gulp-babel": "^6.1.2",
+    "gulp-babel": "^7.0.0",
     "gulp-babel-istanbul": "^1.6.0",
     "gulp-eslint": "^4.0.0",
     "gulp-inject-modules": "^1.0.0",
     "gulp-mocha": "^3.0.1",
-    "gulp-standard": "^10.0.0",
-    "gulp-stylelint": "^3.8.0",
+    "gulp-standard": "^10.1.1",
+    "gulp-stylelint": "^6.0.0",
     "jsdom": "^9.12.0",
     "lodash.assign": "^4.2.0",
-    "markdownlint": "^0.5.0",
-    "mocha": "^3.3.0",
-    "react-test-renderer": "^15.6.1",
-    "sinon": "^2.3.8",
-    "stylelint": "^8.0.0",
+    "markdownlint": "^0.6.1",
+    "mocha": "^3.5.0",
+    "react-test-renderer": "^15.6.2",
+    "sinon": "^3.2.1",
+    "stylelint": "^8.2.0",
     "stylelint-config-standard": "^17.0.0",
     "watchify": "^3.8.0",
     "xmldom": "^0.1.27"

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,16 +1,16 @@
-Django==1.11.3
-djangorestframework==3.6.3
-django-filter==1.0.4
-django-crispy-forms==1.6.1
+Django==1.11.9
+djangorestframework==3.7.7
+django-filter==1.1.0
+django-crispy-forms==1.7.0
 dj-database-url==0.4.2
 django-rest-swagger==2.1.2
 django-secure==1.0.1
 django-csp==3.3
 django-csp-reports==1.1
-whitenoise==3.3.0
+whitenoise==3.3.1
 django-excel==0.0.9
-pyexcel==0.5.1.1
-pyexcel-xls==0.4.0
-pyexcel-xlsx==0.4.1
-pytz==2017.2
+pyexcel==0.5.6
+pyexcel-xls==0.5.5
+pyexcel-xlsx==0.5.5
+pytz==2017.3
 future==0.16.0
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -1,5 +1,5 @@
 -r base.txt
 
-psycopg2==2.7
-gunicorn==19.7.0
-gevent==1.2.1
+psycopg2==2.7.3.1
+gunicorn==19.7.1
+gevent==1.2.2
diff --git a/requirements/supervisord.txt b/requirements/supervisord.txt
@@ -1,4 +1,4 @@
 -r prod.txt
 
-supervisor==3.3.1
+supervisor==3.3.3
 django-supervisor==0.4.0