Merge pull request #1140 from mitodl/release-candidate

Release 0.76.0
mitodl · Jun 13, 2024 · a27b1cb · a27b1cb
2 parents 75a2ddf + 75fde22
commit a27b1cb
Show file tree

Hide file tree

Showing 28 changed files with 128 additions and 114 deletions.
diff --git a/RELEASE.rst b/RELEASE.rst
@@ -1,6 +1,23 @@
 Release Notes
 =============
 
+Version 0.76.0
+--------------
+
+- Fix how Ramda imports are being made based on usage >0.25
+- Revert "Update python Docker tag to v3.12.4"
+- Update python Docker tag to v3.12.4
+- Update nginx Docker tag to v1.27.0
+- Update dependency flow-bin to v0.237.2
+- Update dependency ramda to ^0.30.0 (#1125)
+- Update dependency webpack-hot-middleware to v2.26.1
+- Update dependency webpack to v4.47.0
+- Update dependency victory to ^0.27.0
+- Update dependency style-loader to ^0.23.0
+- Update dependency sentry-sdk to ^0.20.0
+- Update dependency flow-bin to v0.237.1
+- Update dependency uwsgi to v2.0.26
+
 Version 0.75.1 (Released May 29, 2024)
 --------------
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - "6379"
 
   nginx:
-    image: nginx:1.26.0
+    image: nginx:1.27.0
     volumes:
       - ./config/nginx.conf:/etc/nginx/conf.d/web.conf
       - ./:/src

diff --git a/odl_video/settings.py b/odl_video/settings.py
@@ -13,7 +13,7 @@
 from odl_video.envs import get_any, get_bool, get_int, get_key, get_string, parse_env
 from odl_video.sentry import init_sentry
 
-VERSION = "0.75.1"
+VERSION = "0.76.0"
 
 ENVIRONMENT = get_string("ODL_VIDEO_ENVIRONMENT", "dev")
 

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "eslint-plugin-react": "^7.19.0",
     "express": "^4.17.3",
     "fetch-mock": "^5.12.1",
-    "flow-bin": "0.236.0",
+    "flow-bin": "0.237.2",
     "isomorphic-fetch": "^2.2.1",
     "jquery": "^3.5.0",
     "jsdom": "^16.7.0",
@@ -72,7 +72,7 @@
     "postcss-loader": "^4.2.0",
     "prettier-eslint-cli": "^5.0.0",
     "prop-types": "^15.5.10",
-    "ramda": "^0.24.1",
+    "ramda": "^0.30.0",
     "react": "^15.6.1",
     "react-addons-shallow-compare": "^15.6.0",
     "react-document-title": "^2.0.3",
@@ -97,20 +97,20 @@
     "sass-lint": "^1.10.2",
     "sass-loader": "^10",
     "sinon": "^9.0.2",
-    "style-loader": "^0.18.2",
+    "style-loader": "^0.23.0",
     "tar": "^6.0.0",
     "url-loader": "^4.1.0",
-    "victory": "^0.25.6",
+    "victory": "^0.27.0",
     "video.js": "^7.15.0",
     "videojs-contrib-quality-levels": "^2.0.4",
     "videojs-hls-quality-selector": "^1.1.0",
     "videojs-hotkeys": "^0.2.25",
     "videojs-youtube": "^2.6.0",
-    "webpack": "4.46.0",
+    "webpack": "4.47.0",
     "webpack-bundle-tracker": "^0.4.3",
     "webpack-cli": "^3.3.11",
     "webpack-dev-middleware": "^5.0.0",
-    "webpack-hot-middleware": "2.25.0"
+    "webpack-hot-middleware": "2.26.1"
   },
   "engines": {
     "node": "16.20.2",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -63,12 +63,12 @@ python-dateutil = "^2.8.1"
 pytz = "^2023.3"
 redis = "^4.4.4"
 requests = "^2.20.0"
-sentry-sdk = "^0.14.3"
+sentry-sdk = "^0.20.0"
 smart-open = "^1.5.7"
 structlog = "^20.1.0"
 structlog-sentry = "^1.2.2"
 urllib3 = "^1.24.2"
-uwsgi = "2.0.25.1"
+uwsgi = "2.0.26"
 
 
 [tool.poetry.group.dev.dependencies]

diff --git a/static/js/components/VideoPlayer.js b/static/js/components/VideoPlayer.js
@@ -2,7 +2,7 @@
 /* global videojs: true */
 /* global SETTINGS: false */
 import React from "react"
-import R from "ramda"
+import * as R from "ramda"
 import _ from "lodash"
 import type { Dispatch } from "redux"
 import { makeVideoSubtitleUrl } from "../lib/urls"

diff --git a/static/js/components/dialogs/hoc.js b/static/js/components/dialogs/hoc.js
@@ -1,6 +1,6 @@
 // @flow
 import React from "react"
-import R from "ramda"
+import * as R from "ramda"
 import type { Dispatch } from "redux"
 
 import * as commonUiActions from "../../actions/commonUi"

diff --git a/static/js/components/dialogs/hoc_test.js b/static/js/components/dialogs/hoc_test.js
@@ -4,7 +4,7 @@ import { assert } from "chai"
 import { mount } from "enzyme"
 import { Provider } from "react-redux"
 import configureTestStore from "redux-asserts"
-import R from "ramda"
+import * as R from "ramda"
 import { connect } from "react-redux"
 
 import Dialog from "../material/Dialog"

diff --git a/static/js/components/material/Textfield.js b/static/js/components/material/Textfield.js
@@ -1,6 +1,6 @@
 // @flow
 import React from "react"
-import R from "ramda"
+import * as R from "ramda"
 
 export default class Textfield extends React.Component<*, void> {
   props: {

diff --git a/static/js/containers/CollectionDetailPage.js b/static/js/containers/CollectionDetailPage.js
@@ -3,7 +3,7 @@
 import React from "react"
 import { connect } from "react-redux"
 import type { Dispatch } from "redux"
-import R from "ramda"
+import * as R from "ramda"
 import _ from "lodash"
 import DocumentTitle from "react-document-title"
 

diff --git a/static/js/containers/CollectionListPage.js b/static/js/containers/CollectionListPage.js
@@ -2,7 +2,7 @@
 /* global SETTINGS: false */
 
 import React from "react"
-import R from "ramda"
+import * as R from "ramda"
 import { connect } from "react-redux"
 import type { Dispatch } from "redux"
 import { Link } from "react-router-dom"

diff --git a/static/js/containers/HelpPage.js b/static/js/containers/HelpPage.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react"
 import { connect } from "react-redux"
-import R from "ramda"
+import * as R from "ramda"
 
 import WithDrawer from "./WithDrawer"
 import FAQ from "../components/FAQ"

diff --git a/static/js/containers/VideoDetailPage.js b/static/js/containers/VideoDetailPage.js
@@ -4,7 +4,7 @@ import React from "react"
 import { connect } from "react-redux"
 import moment from "moment"
 import type { Dispatch } from "redux"
-import R from "ramda"
+import * as R from "ramda"
 import _ from "lodash"
 import DocumentTitle from "react-document-title"
 

diff --git a/static/js/containers/WithDrawer.js b/static/js/containers/WithDrawer.js
@@ -1,7 +1,7 @@
 // @flow
 /* global SETTINGS: false */
 import React from "react"
-import R from "ramda"
+import * as R from "ramda"
 import { connect } from "react-redux"
 
 import * as commonUiActions from "../actions/commonUi"

diff --git a/static/js/containers/withPagedCollections.js b/static/js/containers/withPagedCollections.js
@@ -1,6 +1,6 @@
 import React from "react"
 import _ from "lodash"
-import R from "ramda"
+import * as R from "ramda"
 import { connect } from "react-redux"
 import type { Dispatch } from "redux"
 

diff --git a/static/js/containers/withVideoAnalytics.js b/static/js/containers/withVideoAnalytics.js
@@ -1,6 +1,6 @@
 import React from "react"
 import _ from "lodash"
-import R from "ramda"
+import * as R from "ramda"
 import { connect } from "react-redux"
 import type { Dispatch } from "redux"
 

diff --git a/static/js/lib/collection.js b/static/js/lib/collection.js
@@ -1,5 +1,5 @@
 // @flow
-import R from "ramda"
+import * as R from "ramda"
 import _ from "lodash"
 
 import {
@@ -24,7 +24,7 @@ export const getActiveCollectionDetail = (state: {
     null
 
 export const getVideoWithKey = (collection: Collection, key: string) =>
-  R.compose(R.find(R.propEq("key", key)), R.defaultTo([]))(collection.videos)
+  R.compose(R.find(R.propEq(key, "key")), R.defaultTo([]))(collection.videos)
 
 export const getFormKey = (isNew: boolean): string =>
   isNew ? "newCollectionForm" : "editCollectionForm"

diff --git a/static/js/lib/dialog.js b/static/js/lib/dialog.js
@@ -1,5 +1,5 @@
 // @flow
-import R from "ramda"
+import * as R from "ramda"
 
 export const PERM_CHOICE_NONE: string = "none"
 export const PERM_CHOICE_PUBLIC: string = "public"

diff --git a/static/js/lib/sanctuary.js b/static/js/lib/sanctuary.js
@@ -1,5 +1,5 @@
 // @flow
-import R from "ramda"
+import * as R from "ramda"
 import { create, env } from "sanctuary"
 
 export const S = create({ checkTypes: false, env: env })

diff --git a/static/js/lib/sanctuary_test.js b/static/js/lib/sanctuary_test.js
@@ -1,6 +1,6 @@
 // @flow
 import { assert } from "chai"
-import R from "ramda"
+import * as R from "ramda"
 
 import {
   S,

diff --git a/static/js/lib/validation.js b/static/js/lib/validation.js
@@ -1,5 +1,5 @@
 // @flow
-import R from "ramda"
+import * as R from "ramda"
 
 import { S } from "./sanctuary"
 

diff --git a/static/js/lib/video.js b/static/js/lib/video.js
@@ -1,6 +1,6 @@
 // @flow
 /* global SETTINGS: false */
-import R from "ramda"
+import * as R from "ramda"
 
 import {
   VIDEO_STATUS_CREATED,
@@ -44,7 +44,7 @@ export const getHLSEncodedUrl = (video: Video): string | null => {
 }
 
 export const videoIsProcessing = R.compose(
-  R.contains(R.__, [
+  R.includes(R.__, [
     VIDEO_STATUS_CREATED,
     VIDEO_STATUS_UPLOADING,
     VIDEO_STATUS_TRANSCODING
@@ -53,7 +53,7 @@ export const videoIsProcessing = R.compose(
 )
 
 export const videoHasError = R.compose(
-  R.contains(R.__, [
+  R.includes(R.__, [
     VIDEO_STATUS_UPLOAD_FAILED,
     VIDEO_STATUS_TRANSCODE_FAILED_INTERNAL,
     VIDEO_STATUS_TRANSCODE_FAILED_VIDEO,

diff --git a/static/js/reducers/collections.js b/static/js/reducers/collections.js
@@ -1,6 +1,6 @@
 // @flow
 import { GET, PATCH, POST, INITIAL_STATE } from "redux-hammock/constants"
-import R from "ramda"
+import * as R from "ramda"
 
 import * as api from "../lib/api"
 import type { Collection, CollectionList } from "../flow/collectionTypes"

diff --git a/static/js/util/google_analytics.js b/static/js/util/google_analytics.js
@@ -1,7 +1,7 @@
 // @flow
 /* global SETTINGS:false */
 import ga from "react-ga"
-import R from "ramda"
+import * as R from "ramda"
 
 const makeGAEvent = (category, action, label, value) => ({
   category: category,

diff --git a/static/js/util/test_utils.js b/static/js/util/test_utils.js
@@ -2,7 +2,7 @@
 // @flow
 import { assert } from "chai"
 import _ from "lodash"
-import R from "ramda"
+import * as R from "ramda"
 
 import type { Action } from "../flow/reduxTypes"
 import type { Store } from "redux"

diff --git a/static/js/util/util.js b/static/js/util/util.js
@@ -1,6 +1,6 @@
 // @flow
 import { PERM_CHOICE_LISTS } from "../lib/dialog"
-import R from "ramda"
+import * as R from "ramda"
 
 export function getDisplayName(WrappedComponent: any) {
   return WrappedComponent.displayName || WrappedComponent.name || "Component"