12237 upgrade django and psycopg

base_requirements.txt

@@ -121,8 +121,8 @@ netaddr
 Pillow
 
 # PostgreSQL database adapter for Python
-# https://www.psycopg.org/docs/news.html
-psycopg2-binary
+# https://github.com/psycopg/psycopg2/blob/master/NEWS
+psycopg-binary
 
 # YAML rendering library
 # https://github.com/yaml/pyyaml/blob/master/CHANGES

netbox/core/models/data.py

@@ -290,8 +290,10 @@ class DataFile(models.Model):
 
     @property
     def data_as_string(self):
+        if not self.data:
+            return None
         try:
-            return self.data.tobytes().decode('utf-8')
+            return bytes(self.data, 'utf-8')
         except UnicodeDecodeError:
             return None
 

netbox/extras/models/tags.py

@@ -61,6 +61,4 @@ class TaggedItem(GenericTaggedItemBase):
     )
 
     class Meta:
-        index_together = (
-            ("content_type", "object_id")
-        )
+        indexes = [models.Index(fields=["content_type", "object_id"])]

requirements.txt

@@ -1,6 +1,6 @@
 bleach==6.0.0
 boto3==1.26.145
-Django==4.1.9
+Django==4.2.2
 django-cors-headers==4.0.0
 django-debug-toolbar==4.1.0
 django-filter==23.2
@@ -27,7 +27,9 @@ mkdocs-material==9.1.15
 mkdocstrings[python-legacy]==0.22.0
 netaddr==0.8.0
 Pillow==9.5.0
-psycopg2-binary==2.9.6
+psycopg==3.1.9
+psycopg-binary==3.1.9
+psycopg-pool==3.1.7
 PyYAML==6.0
 sentry-sdk==1.25.0
 social-auth-app-django==5.2.0