diff --git a/package.json b/package.json index 90f0e7c7..48bf620e 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,6 @@ "karma-cli": "0.0.4", "karma-firefox-launcher": "^0.1.3", "karma-jasmine": "^0.2.2", - "karma-phantomjs-launcher": "0.2.0", - "phantomjs": "2.1.1", "protractor": "~1.0.0" }, "scripts": { diff --git a/refstack-ui/tests/karma.conf.js b/refstack-ui/tests/karma.conf.js index 34b44b9b..2b054639 100644 --- a/refstack-ui/tests/karma.conf.js +++ b/refstack-ui/tests/karma.conf.js @@ -29,12 +29,11 @@ module.exports = function (config) { frameworks: ['jasmine'], - browsers: ['Firefox', 'PhantomJS', 'Chrome'], + browsers: ['Firefox', 'Chrome'], plugins: [ 'karma-chrome-launcher', 'karma-firefox-launcher', - 'karma-phantomjs-launcher', 'karma-jasmine' ], diff --git a/requirements.txt b/requirements.txt index 28b8780c..9fc5f1dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,9 +7,9 @@ oslo.config>=1.6.0 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0 oslo.log pecan>=0.8.2 -pyOpenSSL==0.13 +pyOpenSSL>=0.14 pycrypto>=2.6 requests>=2.2.0,!=2.4.0 requests-cache>=0.4.9 jsonschema>=2.0.0,<3.0.0 -PyMySQL>=0.6.2,!=0.6.4 \ No newline at end of file +PyMySQL>=0.6.2,!=0.6.4