Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies #3201

Merged
merged 16 commits into from
Aug 10, 2020
Merged

Dependencies #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
846365a
Bump mozilla-nimbus-shared from 0.0.7 to 0.0.9 in /app/requirements (…
dependabot[bot] Aug 10, 2020
3cd2e7f
Bump pytest-forked from 1.2.0 to 1.3.0 in /app/requirements (#3180)
dependabot[bot] Aug 10, 2020
b087e7b
Bump pytest-xdist from 1.33.0 to 1.34.0 in /app/requirements (#3181)
dependabot[bot] Aug 10, 2020
0056fb4
Bump @testing-library/jest-dom in /app/experimenter/static/rapid (#3184)
dependabot[bot] Aug 10, 2020
d9f19a8
Bump celery from 4.4.6 to 4.4.7 in /app/requirements (#3182)
dependabot[bot] Aug 10, 2020
46e5b0e
Bump pytest from 5.4.3 to 6.0.1 in /app/requirements (#3183)
dependabot[bot] Aug 10, 2020
1e91da8
Bump @babel/plugin-proposal-object-rest-spread (#3185)
dependabot[bot] Aug 10, 2020
4b8d66b
Bump eslint from 7.5.0 to 7.6.0 in /app/experimenter/static/rapid (#3…
dependabot[bot] Aug 10, 2020
bec4c6a
Bump @testing-library/jest-dom in /app/experimenter/static/core (#3190)
dependabot[bot] Aug 10, 2020
2a6e20f
Bump fontsource-fira-sans in /app/experimenter/static/core (#3198)
dependabot[bot] Aug 10, 2020
494ef1c
Bump @babel/core from 7.10.5 to 7.11.1 in /app/experimenter/static/co…
dependabot[bot] Aug 10, 2020
ad01ddd
Bump @babel/preset-env in /app/experimenter/static/rapid (#3187)
dependabot[bot] Aug 10, 2020
738a52e
Bump eslint from 7.5.0 to 7.6.0 in /app/experimenter/static/core (#3192)
dependabot[bot] Aug 10, 2020
433831a
Bump @typescript-eslint/eslint-plugin in /app/experimenter/static/rap…
dependabot[bot] Aug 10, 2020
4f29f56
Bump @babel/preset-env in /app/experimenter/static/core (#3193)
dependabot[bot] Aug 10, 2020
be710ec
dependency updates
tiftran Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/experimenter/static/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"autobind-decorator": "2.4.0",
"bootstrap": "4.5.0",
"bootstrap-select": "1.13.17",
"fontsource-fira-sans": "2.2.6",
"fontsource-fira-sans": "3.0.5",
"immutable": "4.0.0-rc.12",
"jquery": "3.5.1",
"popper.js": "1.16.1",
Expand All @@ -44,16 +44,16 @@
"react-select": "3.1.0"
},
"devDependencies": {
"@babel/core": "7.10.5",
"@babel/core": "7.11.1",
"@babel/plugin-proposal-class-properties": "7.10.1",
"@babel/plugin-proposal-decorators": "7.10.5",
"@babel/preset-env": "7.10.3",
"@babel/preset-env": "7.11.0",
"@babel/preset-react": "7.10.1",
"@testing-library/jest-dom": "5.11.1",
"@testing-library/jest-dom": "5.11.2",
"@testing-library/react": "10.4.7",
"babel-eslint": "10.1.0",
"babel-jest": "26.0.1",
"eslint": "7.5.0",
"eslint": "7.6.0",
"eslint-config-prettier": "6.11.0",
"eslint-config-standard": "14.1.1",
"eslint-plugin-import": "2.21.2",
Expand Down
10 changes: 5 additions & 5 deletions app/experimenter/static/rapid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
"@babel/core": "7.10.3",
"@babel/plugin-proposal-class-properties": "7.10.1",
"@babel/plugin-proposal-decorators": "7.10.3",
"@babel/plugin-proposal-object-rest-spread": "7.10.3",
"@babel/plugin-proposal-object-rest-spread": "7.11.0",
"@babel/plugin-transform-runtime": "7.10.5",
"@babel/preset-env": "7.10.3",
"@babel/preset-env": "7.11.0",
"@babel/preset-react": "7.10.1",
"@babel/preset-typescript": "7.10.1",
"@testing-library/jest-dom": "5.11.1",
"@testing-library/jest-dom": "5.11.2",
"@testing-library/react": "10.4.7",
"@types/jest": "26.0.5",
"@types/react-router": "5.1.8",
"@types/react-router-dom": "5.1.5",
"@types/react-select": "3.0.13",
"@typescript-eslint/eslint-plugin": "3.6.1",
"@typescript-eslint/eslint-plugin": "3.9.0",
"@typescript-eslint/parser": "3.7.0",
"babel-loader": "8.1.0",
"eslint": "7.5.0",
"eslint": "7.6.0",
"eslint-config-prettier": "6.11.0",
"eslint-config-react": "1.1.7",
"eslint-plugin-import": "2.21.2",
Expand Down
9 changes: 6 additions & 3 deletions app/requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ regex==2020.7.14 \
--hash=sha256:d6cff2276e502b86a25fd10c2a96973fdb45c7a977dca2138d661417f3728341 \
--hash=sha256:7a2dd66d2d4df34fa82c9dc85657c5e019b87932019947faece7983f2089a840 \
--hash=sha256:3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb
pytest-forked==1.2.0 \
--hash=sha256:42a438336731465c5bd76ab38e1645647ac55914a08b507efbabe8783a08aa6c \
--hash=sha256:65f96334863d9cbe53d21f73e8febc4dd61b8d1fdcac7b487d9af07a5d02a938
pytest-forked==1.3.0 \
--hash=sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815 \
--hash=sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca
execnet==1.7.1 \
--hash=sha256:cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50 \
--hash=sha256:d4efd397930c46415f62f8a31388d6be4f27a91d7550eb79bc64a756e0056547
Expand All @@ -272,3 +272,6 @@ Unidecode==1.1.1 \
--hash=sha256:2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
pyrsistent==0.16.0 \
--hash=sha256:28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3
iniconfig==1.0.1 \
--hash=sha256:80cf40c597eb564e86346103f609d74efce0f6b4d4f30ec8ce9e2c26411ba437 \
--hash=sha256:e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69
27 changes: 13 additions & 14 deletions app/requirements/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Django==3.0.7 \
black==19.10b0 \
--hash=sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b \
--hash=sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539
celery==4.4.6 \
--hash=sha256:ef17d7dffde7fc73ecab3a3b6389d93d3213bac53fa7f28e68e33647ad50b916 \
--hash=sha256:fd77e4248bb1b7af5f7922dd8e81156f540306e3a5c4b1c24167c1f5f06025da
celery==4.4.7 \
--hash=sha256:a92e1d56e650781fb747032a3997d16236d037c8199eacd5217d1a72893bca45 \
--hash=sha256:d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f
coverage==5.2.1 \
--hash=sha256:40f70f81be4d34f8d491e55936904db5c527b0711b2a46513641a5729783c2e4 \
--hash=sha256:675192fca634f0df69af3493a48224f211f8db4e84452b08d5fcebb9167adb01 \
Expand Down Expand Up @@ -87,15 +87,14 @@ psycopg2==2.8.5 \
--hash=sha256:2327bf42c1744a434ed8ed0bbaa9168cac7ee5a22a9001f6fc85c33b8a4a14b7 \
--hash=sha256:132efc7ee46a763e68a815f4d26223d9c679953cd190f1f218187cb60decf535 \
--hash=sha256:f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818
pytest==5.4.3 \
--hash=sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1 \
--hash=sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8
pytest==6.0.1 \
--hash=sha256:8b6007800c53fdacd5a5c192203f4e531eb2a1540ad9c752e052ec0f7143dbad \
--hash=sha256:85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4
pytest-django==3.9.0 \
--hash=sha256:64f99d565dd9497af412fcab2989fe40982c1282d4118ff422b407f3f7275ca5 \
--hash=sha256:664e5f42242e5e182519388f01b9f25d824a9feb7cd17d8f863c8d776f38baf9
pytest-testmon==1.0.2 \
--hash=sha256:e79852203894bbd5a6adb7e0541316c0a3a84322e9766f746ed6b8b62f9897d9 \
--hash=sha256:fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5
pytest-testmon==1.0.3 \
--hash=sha256:927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169
pytest-watch==4.2.0 \
--hash=sha256:06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9
python-decouple==3.3 \
Expand Down Expand Up @@ -153,9 +152,9 @@ markdown2==2.3.9 \
tblib==1.7.0 \
--hash=sha256:289fa7359e580950e7d9743eab36b0691f0310fce64dee7d9c31065b8f723e23 \
--hash=sha256:059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c
pytest-xdist==1.33.0 \
--hash=sha256:9149b4010240643a5e206fd0ece6f0a1cd5955dae014cf04610d359e22e22453 \
--hash=sha256:833b902b16473162cc0572d5bd7b63f8b843df63a4ada9c8af1270d31db17607
pytest-xdist==1.34.0 \
--hash=sha256:ba5d10729372d65df3ac150872f9df5d2ed004a3b0d499cc0164aafedd8c7b66 \
--hash=sha256:340e8e83e2a4c0d861bdd8d05c5d7b7143f6eea0aba902997db15c2a86be04ee
djangorestframework-csv==2.1.0 \
--hash=sha256:2f008b20a44f2d3c37835ea5b5ddfe19f54394f07b9cb267c616a917a7f7e27c
unicodecsv==0.14.1 \
Expand All @@ -167,5 +166,5 @@ jsonschema==3.2.0 \
--hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163 \
--hash=sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
mozilla-nimbus-shared==0.0.9 \
--hash=sha256:7f2c8c24ea66fefac42e94e1cae8c3232cfdf3b9a8daf8b8fb738037218d82aa \
--hash=sha256:98542a8d4e0b75ee2394eb9c25775f63d5ef31fed0f8a38ce5bb2835e6e64b1b
--hash=sha256:98542a8d4e0b75ee2394eb9c25775f63d5ef31fed0f8a38ce5bb2835e6e64b1b \
--hash=sha256:7f2c8c24ea66fefac42e94e1cae8c3232cfdf3b9a8daf8b8fb738037218d82aa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious why the SHAs would change if the version didnt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oooh, bad merge conflict resolution me thinks, will fix

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait why why was that missed....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or... wait... maybe the values are the same, just reversed now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait.... seems like you're right..., they're reversed...