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

build(deps): bump the react group across 1 directory with 5 updates #1224

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3122053
Update setuptools requirement from <74,>=73 to >=73,<75
dependabot[bot] Sep 1, 2024
8634365
Bump @babel/cli from 7.24.1 to 7.25.6 in the babel group
dependabot[bot] Sep 1, 2024
d93355d
Bump webpack from 5.93.0 to 5.94.0 in the webpack group
dependabot[bot] Sep 1, 2024
7627c1e
Update django-allauth[openid,socialaccount] requirement
dependabot[bot] Sep 1, 2024
0e9e724
build(deps-dev): bump the dev-dependencies group across 1 directory w…
dependabot[bot] Sep 23, 2024
f7b94d9
build(deps): update setuptools requirement from <75,>=73 to >=73,<76
dependabot[bot] Oct 1, 2024
d05a84a
build(deps-dev): bump webpack from 5.94.0 to 5.95.0 in the webpack group
dependabot[bot] Oct 1, 2024
68d1b89
build(deps): bump date-fns in the prod-dependencies group
dependabot[bot] Oct 1, 2024
f02ee6a
build(deps): update importlib-metadata requirement from <8.5.0 to <8.6.0
dependabot[bot] Oct 1, 2024
1b7d142
build(deps): bump the django group with 2 updates
dependabot[bot] Oct 1, 2024
b0d8d99
build(deps): update django-allauth[openid,socialaccount] requirement
dependabot[bot] Nov 1, 2024
bb3ecfc
build(deps-dev): bump webpack from 5.95.0 to 5.96.0 in the webpack group
dependabot[bot] Nov 1, 2024
e1364c6
build(deps-dev): bump the babel group with 3 updates
dependabot[bot] Nov 1, 2024
095fdc4
build(deps): bump react-datepicker in the react group
dependabot[bot] Nov 1, 2024
58eb7bb
build(deps): bump coverallsapp/github-action in the github-actions group
dependabot[bot] Nov 1, 2024
6bf29b4
build(deps-dev): bump eslint-plugin-react
dependabot[bot] Nov 1, 2024
7a5b15d
build(pre-commit): pre-commit autoupdate by ci
pre-commit-ci[bot] Nov 4, 2024
814ff10
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2024
dfbc2fd
build(deps-dev): bump sass
dependabot[bot] Nov 27, 2024
106caf4
build(deps): bump the optional group across 1 directory with 4 updates
dependabot[bot] Nov 28, 2024
6437a7f
Merge pull request #1206 from rdmorganiser/dependabot/pip/dependency-…
MyPyDavid Nov 29, 2024
73a6d90
build(deps): update django-allauth[openid,socialaccount] requirement
dependabot[bot] Dec 1, 2024
653a51d
build(deps): update wheel requirement from <0.45,>=0.42 to >=0.42,<0.46
dependabot[bot] Dec 1, 2024
75361d2
Merge pull request #1207 from rdmorganiser/dependabot/pip/dependency-…
dependabot[bot] Dec 2, 2024
eaace3d
Merge pull request #1208 from rdmorganiser/dependabot/pip/dependency-…
dependabot[bot] Dec 2, 2024
11987a5
build(deps-dev): bump the babel group with 2 updates
dependabot[bot] Jan 1, 2025
5b29ca1
build(deps-dev): bump the webpack group with 2 updates
dependabot[bot] Jan 1, 2025
6378d4e
Merge pull request #1221 from rdmorganiser/dependabot/npm_and_yarn/de…
dependabot[bot] Jan 7, 2025
7403a16
Merge pull request #1219 from rdmorganiser/dependabot/npm_and_yarn/de…
dependabot[bot] Jan 7, 2025
4ea7edc
build(deps-dev): bump sass
dependabot[bot] Jan 7, 2025
30cc92a
Merge pull request #1223 from rdmorganiser/dependabot/npm_and_yarn/de…
dependabot[bot] Jan 8, 2025
e0663d9
build(deps): bump the react group across 1 directory with 5 updates
dependabot[bot] Jan 8, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
env:
GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
- name: Upload coverage data to coveralls.io
uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
with:
flag-name: '${{ matrix.db-backend }}: ${{ matrix.python-version }}'
parallel: true
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Run Coveralls finish
uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
with:
parallel-finished: true

Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ repos:
exclude: \.dot$
- id: debug-statements
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.9
rev: v0.7.2
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.12.0
rev: v9.14.0
hooks:
- id: eslint
args: [--fix, --color]
Expand All @@ -36,7 +36,7 @@ repos:
- [email protected]
- [email protected]
- repo: https://github.com/crate-ci/typos
rev: v1.26.0
rev: v1.27.0
hooks:
- id: typos
exclude: |
Expand Down
4,433 changes: 2,178 additions & 2,255 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,43 @@
"@uiw/react-codemirror": "^4.23.0",
"bootstrap-sass": "^3.4.1",
"classnames": "^2.5.1",
"date-fns": "^3.6.0",
"date-fns": "^4.1.0",
"font-awesome": "4.7.0",
"jquery": "^3.7.1",
"js-cookie": "^3.0.5",
"lodash": "^4.17.21",
"popper.js": "^1.16.1",
"prop-types": "^15.7.2",
"react": "^18.3.1",
"react": "^19.0.0",
"react-bootstrap": "0.33.1",
"react-datepicker": "7.3.0",
"react-datepicker": "7.6.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-dom": "^19.0.0",
"react-dropzone": "^14.3.5",
"react-redux": "^8.1.3",
"react-select": "^5.8.0",
"react-select": "^5.9.0",
"redux": "^4.1.1",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"react-diff-viewer-continued": "^3.4.0"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.0",
"@babel/preset-env": "^7.25.3",
"@babel/preset-react": "^7.24.1",
"babel-loader": "^9.1.3",
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.26.3",
"babel-loader": "^9.2.1",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.1",
"eslint": "~8.56.0",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react": "^7.37.2",
"file-loader": "^6.2.0",
"mini-css-extract-plugin": "^2.9.0",
"sass": "^1.77.1",
"sass": "^1.83.1",
"sass-loader": "^16.0.0",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4",
"webpack": "^5.97.1",
"webpack-cli": "^6.0.1",
"webpack-merge": "6.0.1"
}
}
18 changes: 9 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies = [
"defusedcsv>=2.0,<3.0",
"defusedxml>=0.7.1,<1.0",
"django>=4.2,<5.0",
"django-cleanup>=8.0,<9.0",
"django-cleanup>=8.0,<10.0",
"django-compressor>=4.4,<5.0",
"django-extensions>=3.2,<4.0",
"django-filter>=23.2,<25.0",
Expand All @@ -56,7 +56,7 @@ dependencies = [
"django-widget-tweaks>=1.5,<2.0",
"djangorestframework>=3.15,<4.0",
"drf-extensions>=0.7.1,<1.0",
"importlib_metadata<8.5.0", # upstrem problem, see https://github.com/python/importlib_metadata/issues/506
"importlib_metadata<8.6.0", # upstrem problem, see https://github.com/python/importlib_metadata/issues/506
"iso8601>=2.0,<3.0",
"markdown>=3.4,<4.0",
"packaging>=23.2,<25.0",
Expand All @@ -67,7 +67,7 @@ dependencies = [

[project.optional-dependencies]
allauth = [
"django-allauth[socialaccount,openid]>=64.1.0,<64.2.0",
"django-allauth[socialaccount,openid]>=64.1.0,<65.4.0",
]
ci = [
"rdmo[dev]",
Expand All @@ -76,18 +76,18 @@ ci = [
dev = [
"build>=1.0,<2.0",
"pipdeptree>=2.13,<3.0",
"pre-commit>=3.4,<4.0",
"setuptools>=73,<74",
"pre-commit>=3.4,<5.0",
"setuptools>=73,<76",
"twine>=5.1.1,<6.0",
"wheel>=0.42,<0.45",
"wheel>=0.42,<0.46",
"rdmo[allauth]",
"rdmo[pytest]",
]
gunicorn = [
"gunicorn>=23.0,<24.0",
]
ldap = [
"django-auth-ldap>=4.5,<5.0",
"django-auth-ldap>=4.5,<6.0",
]
mysql = [
"mysqlclient>=2.2,<3.0",
Expand All @@ -97,10 +97,10 @@ postgres = [
]
pytest = [
"pytest>=8.0,<9.0",
"pytest-cov>=4.1,<6.0",
"pytest-cov>=4.1,<7.0",
"pytest-django>=4.5,<5.0",
"pytest-mock>=3.11,<4.0",
"pytest-playwright>=0.4.3,<0.6.0",
"pytest-playwright>=0.4.3,<0.7.0",
"pytest-randomly>=3.15,<4.0",
"pytest-xdist>=3.3,<4.0",
]
Expand Down
4 changes: 2 additions & 2 deletions rdmo/conditions/tests/test_validator_locked.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Condition
from ..serializers.v1 import ConditionSerializer
Expand Down Expand Up @@ -93,7 +93,7 @@ def test_serializer_update_error(db):
validator = ConditionLockedValidator()
serializer = ConditionSerializer(instance=condition)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'locked': True
}, serializer)
Expand Down
6 changes: 3 additions & 3 deletions rdmo/conditions/tests/test_validator_unique_uri.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.conf import settings
from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Condition
from ..serializers.v1 import ConditionSerializer
Expand Down Expand Up @@ -58,7 +58,7 @@ def test_unique_uri_validator_serializer_create_error(db):
validator = ConditionUniqueURIValidator()
serializer = ConditionSerializer()

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': settings.DEFAULT_URI_PREFIX,
'uri_path': Condition.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path
Expand All @@ -83,7 +83,7 @@ def test_unique_uri_validator_serializer_update_error(db):
validator = ConditionUniqueURIValidator()
serializer = ConditionSerializer(instance=condition)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': condition.uri_prefix,
'uri_path': Condition.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path
Expand Down
4 changes: 2 additions & 2 deletions rdmo/domain/tests/test_validator_locked.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Attribute
from ..serializers.v1 import AttributeSerializer
Expand Down Expand Up @@ -149,7 +149,7 @@ def test_serializer_update_error(db):
validator = AttributeLockedValidator()
serializer = AttributeSerializer(instance=attribute)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'locked': True
}, serializer)
4 changes: 2 additions & 2 deletions rdmo/domain/tests/test_validator_parent.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.conf import settings
from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Attribute
from ..serializers.v1 import AttributeSerializer
Expand Down Expand Up @@ -69,7 +69,7 @@ def test_serializer_update_error(db):
validator = AttributeParentValidator()
serializer = AttributeSerializer(instance=attribute)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': attribute.uri_prefix,
'key': attribute.key,
Expand Down
6 changes: 3 additions & 3 deletions rdmo/domain/tests/test_validator_unique_uri.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.conf import settings
from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Attribute
from ..serializers.v1 import AttributeSerializer
Expand Down Expand Up @@ -62,7 +62,7 @@ def test_validator_serializer_create_error(db):
validator = AttributeUniqueURIValidator()
serializer = AttributeSerializer()

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': settings.DEFAULT_URI_PREFIX,
'key': 'text',
Expand All @@ -87,7 +87,7 @@ def test_validator_serializer_update_error(db):
validator = AttributeUniqueURIValidator()
serializer = AttributeSerializer(instance=attribute)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': attribute.uri_prefix,
'key': 'textarea',
Expand Down
4 changes: 2 additions & 2 deletions rdmo/options/tests/test_validator_locked_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Option, OptionSet
from ..serializers.v1 import OptionSerializer
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_serializer_update_error(db):
validator = OptionLockedValidator()
serializer = OptionSerializer(instance=option)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'locked': True
}, serializer)
4 changes: 2 additions & 2 deletions rdmo/options/tests/test_validator_locked_optionsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import OptionSet
from ..serializers.v1 import OptionSetSerializer
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_serializer_update_error(db):
validator = OptionSetLockedValidator()
serializer = OptionSetSerializer(instance=optionset)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'locked': True
}, serializer)
6 changes: 3 additions & 3 deletions rdmo/options/tests/test_validator_unique_uri_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.conf import settings
from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Option, OptionSet
from ..serializers.v1 import OptionSerializer
Expand Down Expand Up @@ -76,7 +76,7 @@ def test_unique_uri_validator_serializer_create_error(db):
validator = OptionUniqueURIValidator()
serializer = OptionSerializer()

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': settings.DEFAULT_URI_PREFIX,
'uri_path': Option.objects.first().uri_path
Expand All @@ -101,7 +101,7 @@ def test_unique_uri_validator_serializer_update_error(db):
validator = OptionUniqueURIValidator()
serializer = OptionSerializer(instance=instance)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': instance.uri_prefix,
'uri_path': Option.objects.exclude(id=instance.id).first().uri_path
Expand Down
6 changes: 3 additions & 3 deletions rdmo/options/tests/test_validator_unique_uri_optionsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.conf import settings
from django.core.exceptions import ValidationError

from rest_framework.exceptions import ValidationError as RestFameworkValidationError
from rest_framework.exceptions import ValidationError as RestFrameworkValidationError

from ..models import Option, OptionSet
from ..serializers.v1 import OptionSetSerializer
Expand Down Expand Up @@ -76,7 +76,7 @@ def test_unique_uri_validator_serializer_create_error(db):
validator = OptionSetUniqueURIValidator()
serializer = OptionSetSerializer()

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': settings.DEFAULT_URI_PREFIX,
'uri_path': OptionSet.objects.first().uri_path
Expand All @@ -101,7 +101,7 @@ def test_unique_uri_validator_serializer_update_error(db):
validator = OptionSetUniqueURIValidator()
serializer = OptionSetSerializer(instance=instance)

with pytest.raises(RestFameworkValidationError):
with pytest.raises(RestFrameworkValidationError):
validator({
'uri_prefix': instance.uri_prefix,
'uri_path': OptionSet.objects.exclude(id=instance.id).first().uri_path
Expand Down
Loading
Loading