From 91b947875543ddba4430dd99b16689b0f2f6c8b2 Mon Sep 17 00:00:00 2001 From: Matt Hughes Date: Thu, 6 Dec 2018 16:57:27 -0500 Subject: [PATCH] Set NPM dependencies more stably also manually increment edx-proctoring version, since that's all we wanted to achieve with this --- package-lock.json | 15 +++++++-------- package.json | 4 ++-- requirements/edx/base.txt | 4 ++++ requirements/edx/development.txt | 4 ++++ requirements/edx/testing.txt | 4 ++++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee3572b419..19f9a2735e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,17 +86,16 @@ } }, "@edx/edx-proctoring": { - "version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3" + "version": "1.5.0-rc.1", + "resolved": "https://registry.npmjs.org/@edx/edx-proctoring/-/edx-proctoring-1.5.0-rc.1.tgz", + "integrity": "sha512-ONkLR0jW1REC+Z40FPLP0lhT/TEF1UR2sElrpfmO2gTxYbk/Dw5ah9eYPOhBuQNp4giYDzZeCNfz5pgILDeo9w==" }, "@edx/mockprock": { - "version": "git+https://git@github.com/edx/mockprock.git#181d2c962006ffcecfda009ee9b6f417982c48c6", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@edx/mockprock/-/mockprock-1.0.1.tgz", + "integrity": "sha512-XUVRpmeBUvNKaKG3lZz9D8HY4Mykw5duW6qAmSQUOWFy2ILaMFjcT5hMApog/xC9rIp2P2EEzha0tOwuiP7P2g==", "requires": { - "@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3" - }, - "dependencies": { - "@edx/edx-proctoring": { - "version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3" - } + "@edx/edx-proctoring": "1.5.0-rc.1" } }, "@edx/paragon": { diff --git a/package.json b/package.json index 0e38060699..93733742e8 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "dependencies": { "@edx/cookie-policy-banner": "1.1.10", "@edx/edx-bootstrap": "1.0.3", - "@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git", - "@edx/mockprock": "git+https://git@github.com/edx/mockprock.git", + "@edx/edx-proctoring": "^1.5.0-rc.1", + "@edx/mockprock": "^1.0.1", "@edx/paragon": "2.6.4", "@edx/studio-frontend": "1.16.12", "babel-core": "6.26.0", diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index bc242d26a7..1187d01391 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -126,6 +126,7 @@ edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD edx-proctoring==1.4.0 ======= edx-proctoring==1.5.0b1 @@ -133,6 +134,9 @@ edx-proctoring==1.5.0b1 ======= edx-proctoring==1.5.0b3 >>>>>>> Updated edx-proctoring pre-release +======= +edx-proctoring==1.5.0rc1 +>>>>>>> Set NPM dependencies more stably edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a9447057e3..2e1292fc2a 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -146,6 +146,7 @@ edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD edx-proctoring==1.4.0 ======= edx-proctoring==1.5.0b1 @@ -153,6 +154,9 @@ edx-proctoring==1.5.0b1 ======= edx-proctoring==1.5.0b3 >>>>>>> Updated edx-proctoring pre-release +======= +edx-proctoring==1.5.0rc1 +>>>>>>> Set NPM dependencies more stably edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-sphinx-theme==1.4.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 81d82e3f37..41443cc186 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -141,6 +141,7 @@ edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD edx-proctoring==1.4.0 ======= edx-proctoring==1.5.0b1 @@ -148,6 +149,9 @@ edx-proctoring==1.5.0b1 ======= edx-proctoring==1.5.0b3 >>>>>>> Updated edx-proctoring pre-release +======= +edx-proctoring==1.5.0rc1 +>>>>>>> Set NPM dependencies more stably edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12