Merge pull request #1745 from bitwiseman/task/deps

Update dependencies
This commit is contained in:
Liam Newman 2020-01-14 10:19:50 -08:00 committed by GitHub
commit 472664c756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 492 additions and 422 deletions

View File

@ -2,21 +2,21 @@
jobs:
- job: 'Windows'
pool:
vmImage: 'vs2017-win2016'
vmImage: 'windows-latest'
strategy:
matrix:
Python34_Node8:
python.version: '3.4'
python.architecture: 'x86'
node_version: 8.x
Python36_Node10:
python.version: '3.6'
python.architecture: 'x64'
node_version: 10.x
Python37_Node11:
Python37_Node12:
python.version: '3.7'
python.architecture: 'x64'
node_version: 11.x
node_version: 12.x
Python38_Node13:
python.version: '3.8'
python.architecture: 'x64'
node_version: 13.x
maxParallel: 6
steps:
@ -36,21 +36,21 @@ jobs:
- job: 'Linux'
pool:
vmImage: 'ubuntu-16.04' # other options: 'macOS-10.13', 'vs2017-win2016'
vmImage: 'ubuntu-latest'
strategy:
matrix:
Python27_Node6:
Python27_Node8:
python.version: '2.7'
node_version: 6.x
Python34_Node8:
python.version: '3.4'
node_version: 8.x
Python36_Node10:
python.version: '3.6'
Python35_Node10:
python.version: '3.5'
node_version: 10.x
Python37_Node11:
Python37_Node12:
python.version: '3.7'
node_version: 11.x
node_version: 12.x
Python38_Node13:
python.version: '3.8'
node_version: 13.x
maxParallel: 6
steps:
@ -69,15 +69,15 @@ jobs:
- job: 'MacOS'
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-latest'
strategy:
matrix:
Python27_Node6:
Python27_Node8:
python.version: '2.7'
node_version: 6.x
Python37_Node11:
node_version: 8.x
Python37_Node12:
python.version: '3.7'
node_version: 11.x
node_version: 12.x
maxParallel: 6
steps:

858
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -53,14 +53,14 @@
},
"devDependencies": {
"benchmark": "^2.1.4",
"codemirror": "^5.48.2",
"codemirror": "^5.50.2",
"jquery": "^3.4.1",
"jshint": "^2.10.2",
"mocha": "^6.1.4",
"mustache": "^3.0.1",
"jshint": "^2.11.0",
"mocha": "^6.2.2",
"mustache": "^3.2.1",
"node-static": "^0.7.11",
"requirejs": "^2.3.6",
"webpack": "^4.36.1",
"webpack-cli": "^3.3.5"
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
}
}

View File

@ -44,7 +44,7 @@ setup(name='jsbeautifier',
'jsbeautifier.core',
'jsbeautifier.javascript',
'jsbeautifier.unpackers', 'jsbeautifier.unpackers.tests'],
install_requires=["six>=1.12.0", "editorconfig>=0.12.2"],
install_requires=["six>=1.13.0", "editorconfig>=0.12.2"],
license='MIT',
test_suite='pytest.collector',
cmdclass={'test': PyTest},