Merge pull request #1235 from yogeshojha/release/2.0.5

Release/2.0.5
yogeshojha · Apr 20, 2024 · 0f6bab2 · 0f6bab2
2 parents ce1bb60 + c5c9384
commit 0f6bab2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -17,7 +17,7 @@
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<span class="badge badge-soft-info">reNgine 2.0.4</span>
+<span class="badge badge-soft-info">reNgine 2.0.5</span>
 {% endblock breadcrumb_title %}
 
 {% block main_content %}

diff --git 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
diff --git a/web/templates/base/_items/top_bar.html b/web/templates/base/_items/top_bar.html
@@ -170,18 +170,18 @@ <h6 class="text-overflow m-0">Welcome {{user.get_username}}!</h6>
     <div class="logo-box">
       <a href="{% url 'dashboardIndex' current_project.slug %}" class="logo logo-dark text-center">
         <span class="logo-sm">
-          <h3 class="text-logo vertical-center">reNgine&nbsp;<small>2.0.4</small></h3>
+          <h3 class="text-logo vertical-center">reNgine&nbsp;<small>2.0.5</small></h3>
         </span>
         <span class="logo-lg">
-          <h3 class="text-logo vertical-center">reNgine&nbsp;<small>2.0.4</small></h3>
+          <h3 class="text-logo vertical-center">reNgine&nbsp;<small>2.0.5</small></h3>
         </span>
       </a>
       <a href="{% url 'dashboardIndex' current_project.slug %}" class="logo logo-light text-center">
         <span class="logo-sm">
-          <h3 class="text-sm-logo vertical-center">reNgine&nbsp;<small>2.0.4</small></h3>
+          <h3 class="text-sm-logo vertical-center">reNgine&nbsp;<small>2.0.5</small></h3>
         </span>
         <span class="logo-lg">
-          <h3 class="text-lg-logo vertical-center">reNgine&nbsp;<small>2.0.4</small></h3>
+          <h3 class="text-lg-logo vertical-center">reNgine&nbsp;<small>2.0.5</small></h3>
         </span>
       </a>
     </div>

diff --git a/web/templates/base/login.html b/web/templates/base/login.html
@@ -58,7 +58,7 @@
                   </a>
                 </div>
                 <h3 class="">Login to reNgine</h3>
-                <p>Current release: v2.0.4</p>
+                <p>Current release: v2.0.5</p>
               </div>
               <div class="alert alert-primary" role="alert">
                 <a href="https://rengine.wiki" target="_blank">Learn how to create reNgine account.</a>