Skip to content

Commit

Permalink
Merge branch 'master' into yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
rloomans committed Jan 5, 2017
2 parents 44191a9 + a2bf043 commit aa77e24
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 127 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
"babelify": "^7.3.0",
"bootstrap": "^3.3.7",
"browser-sync": "^2.18.5",
"browserify": "^13.1.1",
"browserify": "^13.3.0",
"gulp": "^3.9.1",
"gulp-concat": "^2.6.1",
"gulp-notify": "^2.2.0",
"gulp-sourcemaps": "^2.2.1",
"gulp-uglify": "^2.0.0",
"gulp-uglifycss": "^1.0.6",
"gulp-util": "^3.0.7",
"gulp-util": "^3.0.8",
"history": "^4.5.0",
"http-status-codes": "^1.0.6",
"jquery": "^3.1.1",
"lodash": "^4.17.2",
"lodash": "^4.17.4",
"moment": "^2.17.1",
"plotly.js": "^1.21.2",
"react": "^15.4.1",
Expand All @@ -63,19 +63,19 @@
"require-dir": "^0.3.1",
"run-sequence": "^1.2.2",
"semver": "^5.3.0",
"snyk": "^1.22.1",
"tablesort": "^4.1.0",
"snyk": "^1.23.1",
"tablesort": "^5.0.0",
"through2": "^2.0.3",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"yargs": "^6.5.0"
"yargs": "^6.6.0"
},
"devDependencies": {
"babel-cli": "^6.18.0",
"babel-register": "^6.18.0",
"chai": "^3.5.0",
"coveralls": "^2.11.14",
"enzyme": "^2.5.1",
"enzyme": "^2.7.0",
"eslint": "^3.12.1",
"eslint-config-standard": "^6.2.1",
"eslint-config-standard-jsx": "^3.2.0",
Expand All @@ -90,13 +90,13 @@
"gulp-mocha": "^3.0.1",
"gulp-standard": "^8.0.3",
"gulp-stylelint": "^3.7.0",
"jsdom": "^9.8.3",
"jsdom": "^9.9.1",
"lodash.assign": "^4.2.0",
"markdownlint": "^0.3.0",
"mocha": "^3.2.0",
"react-addons-test-utils": "^15.4.1",
"sinon": "^1.17.6",
"stylelint": "^7.7.0",
"sinon": "^1.17.7",
"stylelint": "^7.7.1",
"stylelint-config-standard": "^15.0.1",
"watchify": "^3.8.0",
"xmldom": "^0.1.27"
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.10.4
Django==1.10.5
djangorestframework==3.5.3
django-filter==1.0.1
django-crispy-forms==1.6.1
Expand All @@ -8,9 +8,9 @@ wsgiref==0.1.2
django-rest-swagger==2.1.0
django-secure==1.0.1
django-csp==3.1
whitenoise==3.2.2
whitenoise==3.2.3
django-excel==0.0.6
pyexcel==0.4.0
pyexcel==0.4.1
pyexcel-xls==0.3.0
pyexcel-xlsx==0.3.0
pytz==2016.10
2 changes: 1 addition & 1 deletion requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ flake8>=3.0.4
mccabe>=0.5.2
pyflakes>=1.2.3
pycodestyle>=2.0.0
coverage>=4.2
coverage>=4.3.1
pylint-django>=0.7.2
db-sqlite3>=0.0.1
django-extensions>=1.7.3
Expand Down
2 changes: 1 addition & 1 deletion requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

psycopg2==2.6.2
gunicorn==19.6.0
gevent==1.1.2
gevent==1.2.0
Loading

0 comments on commit aa77e24

Please sign in to comment.