Merge branch 'ng' of github.com:allegro/ralph into disable-vips-and-s…

…ecurity-scans # Conflicts: # src/ralph/admin/sitetrees.py # src/ralph/api/tests/test_rendering.py # src/ralph/assets/admin.py # src/ralph/configuration_management/api.py # src/ralph/data_center/admin.py # src/ralph/data_center/api/routers.py # src/ralph/security/api.py # src/ralph/urls/base.py # src/ralph/virtual/admin.py # src/ralph/virtual/api.py
allegro · Feb 24, 2025 · 395c08e · 395c08e
2 parents 13de8c6 + b755cdc
commit 395c08e
Show file tree

Hide file tree

Showing 692 changed files with 28,984 additions and 21,719 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,13 @@
 # Ralph
 
-Effective January 1, 2024, all development and maintenance activities associated with the Ralph project on Allegro's GitHub will be discontinued. This means that no further updates or modifications will be applied to the codebase. However, the current version of the code available in the repository will remain the property of the community, allowing individuals to continue contributing to and developing Ralph as they deem appropriate.
+## Update - 2025/02
 
-Allegro intends to continue the development of Ralph through its internal processes. However, this development will not be publicly accessible, and any updates or modifications made by Allegro will not reflect in the community version of the code. Nevertheless, Allegro may opt to release new versions of Ralph based on its internal development endeavors at a later date.
+As Allegro, we continue to publish Ralph's source code and will maintain its development under a "Sources only" model, without guarantees. We believe this approach will be beneficial, allowing everyone to use and build upon the software. Our current goal is to modernize the software and ensure its long-term maintainability, and we're investing into it in 2025.
+
+However, we are not operating under a contribution-based model. While we welcome discussions, we do not guarantee responses to issues or support for pull requests. If you require commercial support, please visit http://ralph.discourse.group.
+
+We sincerely appreciate all past contributions that have shaped Ralph into the powerful tool it is today, and encourage the community to continue using it.
 
-We express our heartfelt gratitude to everyone who has contributed to Ralph's development thus far. Without the dedicated efforts of the community, Ralph would not have evolved into the powerful tool it is today. Although our active development of Ralph will cease, we encourage the community to persist in utilizing and expanding upon the codebase in the years ahead.
 
 ## Overview
 

diff --git a/contrib/dhcp_agent/dhcp_agent.py b/contrib/dhcp_agent/dhcp_agent.py
@@ -11,20 +11,21 @@
 import subprocess
 import sys
 import tempfile
-from optparse import OptionParser
 from logging import handlers as logging_handlers
+from optparse import OptionParser
 
 IS_PY3 = sys.version_info[0] == 3
 if IS_PY3:
     from dbm import gnu as cache_db
-    from urllib.request import urlopen, Request
-    from urllib.parse import urlencode
     from urllib.error import HTTPError
+    from urllib.parse import urlencode
+    from urllib.request import Request, urlopen
     string_types = (str,)
 else:
     import dbm as cache_db
     from urllib import urlencode
-    from urllib2 import urlopen, Request, HTTPError
+
+    from urllib2 import HTTPError, Request, urlopen
     string_types = (basestring,)
 
 

diff --git a/contrib/dhcp_agent/test.py b/contrib/dhcp_agent/test.py
@@ -1,14 +1,14 @@
-import unittest
 import logging
-from mock import patch, MagicMock, Mock
+import unittest
 from optparse import Values
 
 from dhcp_agent import (
+    Cache,
+    DHCPConfigManager,
     _check_params,
     _get_cmd_params_from_parser,
-    Cache,
-    DHCPConfigManager
 )
+from mock import MagicMock, Mock, patch
 
 logger = logging.getLogger(__file__)
 mocked_parser = MagicMock()

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,103 @@
+ralph (20250214.1) bionic; urgency=medium
+
+  * Fix invoice report action missing because of changes in django 2.2
+
+ -- Paweł Szulc <[email protected]>  Fri, 14 Feb 2025 11:56:16 +0000
+
+ralph (20250214.1) bionic; urgency=medium
+
+  * Fix invoice report action missing because of changes in django 2.2
+
+ -- Paweł Szulc <[email protected]>  Fri, 14 Feb 2025 11:55:20 +0000
+
+ralph (20250205.1) bionic; urgency=medium
+
+  [ Olga Matyla ]
+  * Django 2.1
+  * Bump drf
+  * Fix tests_functional
+  * Fix custom fields tests
+  * Fix jQuery error in tabularFormset
+
+  [ Paweł Szulc ]
+  * Django 2.2
+  * Fix basename
+  * Up Markdown to 3.0 - seems to be working fine
+  * Add ruff to reqs
+  * Remove ruff - available only in >=python3.8
+  * Bump pyflakes
+
+  [ Olga Matyla ]
+  * Fix Tags Filter value in GUI (#3879)
+
+ -- Paweł Szulc <[email protected]>  Wed, 05 Feb 2025 11:56:26 +0000
+
+ralph (20250205.1) bionic; urgency=medium
+
+  [ Olga Matyla ]
+  * Django 2.1
+  * Bump drf
+  * Fix tests_functional
+  * Fix custom fields tests
+  * Fix jQuery error in tabularFormset
+
+  [ Paweł Szulc ]
+  * Django 2.2
+  * Fix basename
+  * Up Markdown to 3.0 - seems to be working fine
+  * Add ruff to reqs
+  * Remove ruff - available only in >=python3.8
+  * Bump pyflakes
+
+  [ Olga Matyla ]
+  * Fix Tags Filter value in GUI (#3879)
+
+ -- Paweł Szulc <[email protected]>  Wed, 05 Feb 2025 11:55:35 +0000
+
+ralph (20250205.1) bionic; urgency=medium
+
+  [ Olga Matyla ]
+  * Django 2.1
+  * Bump drf
+  * Fix tests_functional
+  * Fix custom fields tests
+  * Fix jQuery error in tabularFormset
+
+  [ Paweł Szulc ]
+  * Django 2.2
+  * Fix basename
+  * Up Markdown to 3.0 - seems to be working fine
+  * Add ruff to reqs
+  * Remove ruff - available only in >=python3.8
+  * Bump pyflakes
+
+  [ Olga Matyla ]
+  * Fix Tags Filter value in GUI (#3879)
+
+ -- Paweł Szulc <[email protected]>  Wed, 05 Feb 2025 11:55:04 +0000
+
+ralph (20250205.1) bionic; urgency=medium
+
+  [ Olga Matyla ]
+  * Django 2.1
+  * Bump drf
+  * Fix tests_functional
+  * Fix custom fields tests
+  * Fix jQuery error in tabularFormset
+
+  [ Paweł Szulc ]
+  * Django 2.2
+  * Fix basename
+  * Up Markdown to 3.0 - seems to be working fine
+  * Add ruff to reqs
+  * Remove ruff - available only in >=python3.8
+  * Bump pyflakes
+
+  [ Olga Matyla ]
+  * Fix Tags Filter value in GUI (#3879)
+
+ -- Paweł Szulc <[email protected]>  Wed, 05 Feb 2025 11:53:17 +0000
+
 ralph (20241211.1) bionic; urgency=medium
 
   [ Olga Matyla ]

diff --git a/docker/provision/createsuperuser.py b/docker/provision/createsuperuser.py
@@ -7,7 +7,6 @@
 
 from django.contrib.auth import get_user_model
 
-
 User = get_user_model()
 
 username = os.getenv('RALPH_DEFAULT_SUPERUSER_NAME', 'ralph')

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,8 +1,8 @@
 -r openstack.txt
 -r hermes.txt
-Django==2.1.15
+Django==2.2.28
 Faker==0.9.0
-Markdown<3.0  # headerid extension removed in 3.0 - see #3313 for details
+Markdown==3.0
 Pillow==6.2.2
 Unidecode==0.04.18
 dj.choices==0.11.0
@@ -19,16 +19,16 @@ django-sitetree==1.13.0
 django-taggit-serializer==0.1.7
 django-taggit==0.22.2
 django-threadlocals==0.8
-djangorestframework==3.8.2
-djangorestframework_xml==1.2.0
-drf-nested-routers==0.11.1
+djangorestframework==3.13.1
+djangorestframework_xml==2.0.0
+drf-nested-routers==0.92.5
 factory-boy==2.11.1
 mysqlclient==1.3.13
 netaddr==0.7.18
 openpyxl==2.4.0
 py-moneyed==1.2
 python-dateutil==2.4.2
-pytz==2015.4
+pytz==2024.2
 redis==3.2.1
 requests-oauthlib==1.3.0
 requests==2.20.0

diff --git a/requirements/code_style.txt b/requirements/code_style.txt
@@ -1,3 +1,3 @@
-flake8==3.0.4
+flake8==3.7.9
 isort==4.2.5
-pyflakes==1.5.0
+pyflakes==2.1.0
diff --git a/requirements/prod_ldap.txt b/requirements/prod_ldap.txt
@@ -1,2 +1,2 @@
 -r prod.txt
-django-auth-ldap==1.6.1
+django-auth-ldap==2.1.0
diff --git a/setup.py b/setup.py
@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
 
 import os
-import sys
-from setuptools import setup, find_packages
 import subprocess
+import sys
+
+from setuptools import find_packages, setup
 
 assert sys.version_info >= (3, 3), 'Python 3.3+ required.'
 

diff --git a/src/ralph/__init__.py b/src/ralph/__init__.py
@@ -1,11 +1,11 @@
 from django.db.models.options import Options
 
-__version__ = '3.0.0'
+__version__ = "3.0.0"
 
 
 def monkey_options_init(self, meta, app_label):
     self._old__init__(meta, app_label)
-    self.default_permissions = ('add', 'change', 'delete', 'view')
+    self.default_permissions = ("add", "change", "delete", "view")
 
 
 Options._old__init__ = Options.__init__

diff --git a/src/ralph/__main__.py b/src/ralph/__main__.py
@@ -3,30 +3,30 @@
 import sys
 
 
-def main(settings_module='ralph.settings', force=False):
+def main(settings_module="ralph.settings", force=False):
     if force:
-        os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
+        os.environ["DJANGO_SETTINGS_MODULE"] = settings_module
     else:
-        os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings_module)
+        os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)
 
 
 def dev():
-    main('ralph.settings.dev')
+    main("ralph.settings.dev")
 
 
 def test():
     # test only with test settings, not local (or any set by environment
     # variable DJANGO_SETTINGS_MODULE)
-    main('ralph.settings.test', force=True)
+    main("ralph.settings.test", force=True)
 
 
 def prod():
-    main('ralph.settings.prod')
+    main("ralph.settings.prod")
 
 
-if __name__ == '__main__':
-    main('ralph.settings.prod')
+if __name__ == "__main__":
+    main("ralph.settings.prod")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,6 @@

		from django.contrib.auth import get_user_model


		User = get_user_model()

		username = os.getenv('RALPH_DEFAULT_SUPERUSER_NAME', 'ralph')
Expand Down