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.

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

Release 0.76.0 #1140

Merged
merged 16 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -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)
--------------

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion odl_video/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
18 changes: 10 additions & 8 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion static/js/components/VideoPlayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/components/dialogs/hoc.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/components/dialogs/hoc_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/components/material/Textfield.js
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/CollectionDetailPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/CollectionListPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/HelpPage.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/VideoDetailPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/WithDrawer.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/withPagedCollections.js
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/withVideoAnalytics.js
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions static/js/lib/collection.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import R from "ramda"
import * as R from "ramda"
import _ from "lodash"

import {
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/lib/dialog.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/lib/sanctuary.js
Original file line number Diff line number Diff line change
@@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion static/js/lib/sanctuary_test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
import { assert } from "chai"
import R from "ramda"
import * as R from "ramda"

import {
S,
Expand Down
2 changes: 1 addition & 1 deletion static/js/lib/validation.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import R from "ramda"
import * as R from "ramda"

import { S } from "./sanctuary"

Expand Down
6 changes: 3 additions & 3 deletions static/js/lib/video.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
/* global SETTINGS: false */
import R from "ramda"
import * as R from "ramda"

import {
VIDEO_STATUS_CREATED,
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion static/js/reducers/collections.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/util/google_analytics.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion static/js/util/test_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion static/js/util/util.js
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading
Loading