From 2c94e1843de7c5763df61d7ac6085ec531052a23 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 27 Jul 2023 21:38:27 +0500 Subject: [PATCH] fix: update django-simple-history to latest --- Makefile | 2 ++ requirements/base.txt | 9 ++++----- requirements/common_constraints.txt | 2 +- requirements/dev.txt | 4 ++-- requirements/quality.txt | 4 ++-- requirements/test.txt | 11 +++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index c675369b78..b24161a4de 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t mv requirements/common_constraints.tmp requirements/common_constraints.txt sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt + sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/requirements/base.txt b/requirements/base.txt index e6624f5dee..512fb8d14f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -50,6 +50,7 @@ django==3.2.20 # -r requirements/base.in # django-crum # django-model-utils + # django-waffle # djangorestframework # drf-jwt # edx-django-utils @@ -67,11 +68,9 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in -django-waffle==3.0.0 +django-simple-history==3.3.0 + # via -r requirements/base.in +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34dfd..18ff1b20a0 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -25,7 +25,7 @@ Django<4.0 elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -django-simple-history==3.0.0 + # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 diff --git a/requirements/dev.txt b/requirements/dev.txt index 962eec5d79..704edc1689 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -97,7 +97,7 @@ pygments==2.15.1 # via # diff-cover # rich -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -143,7 +143,7 @@ tomli==2.0.1 # via # pylint # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint tox==3.28.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 178b173503..7f6a8e4384 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -59,7 +59,7 @@ pydocstyle==6.3.0 # via -r requirements/quality.in pygments==2.15.1 # via rich -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -99,7 +99,7 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typer[all]==0.7.0 # via rstcheck diff --git a/requirements/test.txt b/requirements/test.txt index d029cfe3d0..d766dd5bcf 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -52,6 +52,7 @@ ddt==1.6.0 # -r requirements/base.in # django-crum # django-model-utils + # django-waffle # djangorestframework # drf-jwt # edx-django-utils @@ -70,11 +71,9 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in -django-waffle==3.0.0 +django-simple-history==3.3.0 + # via -r requirements/base.in +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils @@ -220,7 +219,7 @@ requests==2.31.0 # httmock # responses # slumber -responses==0.23.1 +responses==0.23.2 # via -r requirements/test.in rules==3.3 # via -r requirements/base.in