Merge pull request #2842 from obfuscurity/obfu/add_pipfile_lock

Add Pipfile.lock

Pipfile

@@ -0,0 +1,25 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+django = "<5,>=3.2"
+python-memcached = "==1.58"
+txamqp = "==0.8"
+django-tagging = "==0.5.0"
+gunicorn = "*"
+pytz = "*"
+pyparsing = ">=2.3.0"
+cairocffi = "*"
+whitenoise = "==4.1.4"
+urllib3 = "*"
+six = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.8"
+
+[packages.whisper]
+git = "https://github.com/graphite-project/whisper.git"

requirements.txt

@@ -38,7 +38,7 @@
 Django>=3.2,<5
 python-memcached==1.58
 txAMQP==0.8
-django-tagging==0.4.6
+django-tagging==0.5.0
 gunicorn
 pytz
 pyparsing>=2.3.0
@@ -49,3 +49,4 @@ git+https://github.com/graphite-project/whisper.git#egg=whisper
 whitenoise==4.1.4
 urllib3
 six
+importlib_metadata

webapp/graphite/events/models.py

@@ -7,6 +7,10 @@
 import six
 django.utils.encoding.python_2_unicode_compatible = six.python_2_unicode_compatible
 django.utils.six = six
+try:
+    django.utils.encoding.smart_text = django.utils.encoding.smart_str
+except ImportError:
+    pass
 from tagging.models import Tag  # noqa: E402
 
 from graphite.events.compat import ModelTaggedItemManager  # noqa: E402