From be69c8e4fe0740e2130414cc3b581408335c2b3d Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sat, 20 Apr 2024 17:07:33 +0530 Subject: [PATCH 1/2] Fixes #1234 celery is unable to load tasks, issue with celery and redis versions --- web/requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/requirements.txt b/web/requirements.txt index 49966c967..ec1e88989 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,21 +1,21 @@ aiodns==3.0.0 argh==0.26.2 beautifulsoup4==4.9.3 -celery==5.3.4 +celery==5.4.0 discord-webhook==1.3.0 Django==3.2.4 django-ace==1.0.11 -django-celery-beat==2.2.1 +django-celery-beat==2.6.0 django-login-required-middleware==0.6.1 django-role-permissions==3.2.0 django-mathfilters==1.0.0 -django-timezone-field==4.1.2 +django-timezone-field==6.1.0 djangorestframework==3.12.4 djangorestframework-datatables==0.6.0 dotted-dict==1.1.3 drf-yasg==1.21.3 -gunicorn==21.2.0 -gevent==23.9.1 +gunicorn==22.0.0 +gevent==24.2.1 humanize==4.3.0 Markdown==3.3.4 metafinder==1.2 @@ -26,14 +26,14 @@ PyYAML==6.0.1 PySocks==1.7.1 psycopg2==2.9.7 pycvesearch==1.0 -redis==5.0.0 -requests==2.28.1 +redis==5.0.3 +requests==2.31.0 scapy==2.4.3 tldextract==3.5.0 uro==1.0.0 validators==0.18.2 -watchdog==3.0.0 +watchdog==4.0.0 whatportis weasyprint==53.3 wafw00f==2.2.0 -xmltodict==0.13.0 +xmltodict==0.13.0 \ No newline at end of file From c5c93842cab5226665dc5a6a071bf947ab64f972 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sat, 20 Apr 2024 17:10:05 +0530 Subject: [PATCH 2/2] release chores update version --- CHANGELOG.md | 6 ++++++ docker-compose.dev.yml | 2 +- docker-compose.yml | 2 +- web/dashboard/templates/dashboard/index.html | 2 +- web/templates/base/_items/top_bar.html | 8 ++++---- web/templates/base/login.html | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e04ce6795..39064d080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.0.5 + +**Release Date: April 20, 2024** + +* Fix #1234 reNgine unable to load celery tasks due to mismatched celery and redis versions + ## 2.0.4 **Release Date: April 18, 2024** diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 4e5b27fc8..ce3e862f8 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -98,7 +98,7 @@ services: - POSTGRES_HOST=${POSTGRES_HOST} # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/ - - RENGINE_CURRENT_VERSION='2.0.4' + - RENGINE_CURRENT_VERSION='2.0.5' volumes: - ./web:/usr/src/app - github_repos:/usr/src/github diff --git a/docker-compose.yml b/docker-compose.yml index 7eafa4aaf..a6596986e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: - POSTGRES_HOST=${POSTGRES_HOST} # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/ - - RENGINE_CURRENT_VERSION='2.0.4' + - RENGINE_CURRENT_VERSION='2.0.5' volumes: - ./web:/usr/src/app - github_repos:/usr/src/github diff --git a/web/dashboard/templates/dashboard/index.html b/web/dashboard/templates/dashboard/index.html index 56ac3a29e..e486bb68a 100644 --- a/web/dashboard/templates/dashboard/index.html +++ b/web/dashboard/templates/dashboard/index.html @@ -17,7 +17,7 @@ {% endblock custom_js_css_link %} {% block breadcrumb_title %} -reNgine 2.0.4 +reNgine 2.0.5 {% endblock breadcrumb_title %} {% block main_content %} diff --git a/web/templates/base/_items/top_bar.html b/web/templates/base/_items/top_bar.html index 6b1083f38..473d1b804 100644 --- a/web/templates/base/_items/top_bar.html +++ b/web/templates/base/_items/top_bar.html @@ -170,18 +170,18 @@
Welcome {{user.get_username}}!
diff --git a/web/templates/base/login.html b/web/templates/base/login.html index 6e48a07ae..1d7556919 100644 --- a/web/templates/base/login.html +++ b/web/templates/base/login.html @@ -58,7 +58,7 @@

Login to reNgine

-

Current release: v2.0.4

+

Current release: v2.0.5