Preparing master to Django 3.2 (graphite-project#2766)

* Revert "Add CodeSee architecture diagram workflow to repository"

This reverts commit 217ad6f.

* Fix dependency issue for usage as Grafana data source.

* Add pyparsing version restriction to tox tests.

* Update CHANGELOG.md

* Correct carbon-relay-ng url (graphite-project#2723)

* maxStep in requestContext for Finder (graphite-project#2724)

* Revert "Add CodeSee architecture diagram workflow to repository"

This reverts commit 217ad6f.

* populate maxStep from URL parameter

* populate serialized targets if enabled

* Fixing lint

* Fix dependency issue for usage as Grafana data source.

* Add pyparsing version restriction to tox tests.

* Update CHANGELOG.md

* Correct carbon-relay-ng url (graphite-project#2723)

* Removing "targets_serialized"

* Removing "targets_serialized"

Co-authored-by: Henk Freimuth <[email protected]>
Co-authored-by: Dan Cech <[email protected]>

* Update CHANGELOG.md

* Fix pyparsing > 3.0 compatibility issue. (graphite-project#2727)

* Fix bool() issue in recursion termination check.

The behaviour of ParsedResults seems to have changed in the way that
the usage of pop() along with the bool() check on the object interact
wrt checking if there are further elements in the parsed structure to
consume. In version > 3.0 bool() checks whether either the internal
_toklist or _tokdict members contain items left to consume and returns
True if either do, whereas pop with no arguments will only consume from
the underlying list. That means that we would get a True in the if
condition in this code, whereas a subsequent call to pop() would throw
an exception. Calling asList() forces the use of the list representation
in the bool check here and so fixes this issue.

* Fix pyparsing backwards compatibility issue.

* Remove upper-bound on pin.

* Add pyparsing3 test target for versions >= 3.0.6

* Remove try/except, use dictionary key index syntax

Co-authored-by: Ubuntu <[email protected]>

* Update CHANGELOG.md

* Update CHANGELOG.md

* Actualizing Django version

* fix deprecations / DeepSource warns

* argh

* Adding autofield to settings

* Fix admin.W411

* Master support only new Django

Co-authored-by: Henk Freimuth <[email protected]>
Co-authored-by: Dan Cech <[email protected]>
Co-authored-by: parrotpock <[email protected]>
Co-authored-by: Ubuntu <[email protected]>

Author: 5 people

.github/workflows/tests.yml

@@ -37,7 +37,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['2.7', 'pypy-2.7', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v1

requirements.txt

@@ -1,8 +1,6 @@
 # This is a PIP requirements file.
 # To setup a dev environment:
 #
-#   Use Python 2.7
-#
 #   If you use virtualenvwrapper, you can use the misc/virtualenvwrapper hook scripts to
 #   automate most of the following commands
 #
@@ -37,7 +35,7 @@
 #   deactivate
 #
 
-Django>=1.8,<3.1
+Django>=3.2,<4
 python-memcached==1.58
 txAMQP==0.8
 django-tagging==0.4.6
@@ -49,6 +47,5 @@ git+https://github.com/graphite-project/whisper.git#egg=whisper
 # Ceres is optional
 # git+https://github.com/graphite-project/ceres.git#egg=ceres
 whitenoise==4.1.4
-scandir;python_version<"3.5"
 urllib3
 six

setup.cfg

@@ -12,7 +12,7 @@ requires = Django => 1.8
            pyparsing
            scandir;python_version<"3.5"
 
-post-install = distro/redhat/misc/postinstall
+post_install = distro/redhat/misc/postinstall
 
 provides = graphite
 obsoletes = graphite <= 0.9.9

setup.py

@@ -3,20 +3,11 @@
 from __future__ import with_statement
 
 import os
-try:
-    from ConfigParser import ConfigParser, DuplicateSectionError  # Python 2
-except ImportError:
-    from configparser import ConfigParser, DuplicateSectionError  # Python 3
+from configparser import ConfigParser, DuplicateSectionError  # Python 3
 
 from glob import glob
 from collections import defaultdict
-
-# io.StringIO is strictly unicode only. Python 2 StringIO.StringIO accepts
-# bytes, so we'll conveniently ignore decoding and reencoding the file there.
-try:
-    from StringIO import StringIO  # Python 2
-except ImportError:
-    from io import StringIO  # Python 3
+from io import StringIO  # Python 3
 
 # Graphite historically has an install prefix set in setup.cfg. Being in a
 # configuration file, it's not easy to override it or unset it (for installing
@@ -30,7 +21,7 @@
 with open('setup.cfg', 'r') as f:
     orig_setup_cfg = f.read()
 cf = ConfigParser()
-cf.readfp(StringIO(orig_setup_cfg), 'setup.cfg')
+cf.read_file(StringIO(orig_setup_cfg), 'setup.cfg')
 
 if os.environ.get('GRAPHITE_NO_PREFIX') or os.environ.get('READTHEDOCS'):
     cf.remove_section('install')
@@ -42,19 +33,18 @@
     if not cf.has_option('install', 'prefix'):
         cf.set('install', 'prefix', '/opt/graphite')
     if not cf.has_option('install', 'install-lib'):
-        cf.set('install', 'install-lib', '%(prefix)s/webapp')
+        cf.set('install', 'install_lib', '%(prefix)s/webapp')
 
 with open('setup.cfg', 'w') as f:
     cf.write(f)
 
-if os.environ.get('USE_SETUPTOOLS'):
-    from setuptools import setup
-    setup_kwargs = dict(zip_safe=0)
-
-else:
+if os.environ.get('USE_DISTUTILS'):
+    # skipcq: PYL-W0402
     from distutils.core import setup
     setup_kwargs = dict()
-
+else:
+    from setuptools import setup
+    setup_kwargs = dict(zip_safe=0)
 
 storage_dirs = []
 
@@ -68,11 +58,12 @@
         filepath = os.path.join(root, filename)
         webapp_content[root].append(filepath)
 
-conf_files = [ ('conf', glob('conf/*.example')) ]
-examples = [ ('examples', glob('examples/example-*')) ]
+conf_files = [('conf', glob('conf/*.example'))]
+examples = [('examples', glob('examples/example-*'))]
 
 
 def read(fname):
+    # skipcq: PTC-W6004
     with open(os.path.join(os.path.dirname(__file__), fname)) as f:
         return f.read()
 
@@ -113,26 +104,21 @@ def read(fname):
         'graphite.whitelist',
         'graphite.worker_pool',
       ],
-      package_data={'graphite' :
-        ['templates/*', 'local_settings.py.example']},
+      package_data={'graphite': ['templates/*', 'local_settings.py.example']},
       scripts=glob('bin/*'),
       data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
-      install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
-                        'pyparsing', 'cairocffi', 'urllib3',
-                        'scandir;python_version<"3.5"', 'six'],
+      install_requires=['Django>=3.2,<4', 'django-tagging==0.4.3', 'pytz',
+                        'pyparsing', 'cairocffi', 'urllib3', 'six'],
       classifiers=[
           'Intended Audience :: Developers',
           'Natural Language :: English',
           'License :: OSI Approved :: Apache Software License',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
       ],

tox.ini

@@ -1,17 +1,13 @@
 [gh-actions]
 python =
-    2.7: py27
-    pypy-2.7: pypy
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
 
 [tox]
 envlist =
-  py{27,py}-django111-pyparsing2{,-msgpack,-pyhash},
-  py{37,38,39}-django{111,22,30}-pyparsing{2,3}{,-msgpack},
-  py310-django30-pyparsing3{,-msgpack},
+  py{37,38,39,310}-django32-pyparsing3{,-msgpack},
   lint, docs
 
 [testenv]
@@ -37,12 +33,8 @@ deps =
 	mock
 	git+https://github.com/graphite-project/whisper.git#egg=whisper
 	git+https://github.com/graphite-project/ceres.git#egg=ceres
-	pyparsing2: pyparsing==2.4.7
 	pyparsing3: pyparsing>=3.0.6
-	django111: Django>=1.11,<1.11.99
-	django22: Django>=2.2,<2.2.99
-	django30: Django>=3.0,<3.0.99
-	scandir; python_version<"3.5"
+	django32: Django>=3.2,<4
 	urllib3
 	redis
 	rrdtool
@@ -60,8 +52,8 @@ deps =
 	pytz
 	git+https://github.com/graphite-project/whisper.git#egg=whisper
 	git+https://github.com/graphite-project/ceres.git#egg=ceres
-	Django<3.1
-	pyparsing: pyparsing>=2.3.0,<3.0.0
+	Django<4
+	pyparsing3: pyparsing>=3.0.6
 	Sphinx<1.4
 	jinja2<3.1.0
 	sphinx_rtd_theme

webapp/graphite/app_settings.py

@@ -53,6 +53,7 @@
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.media',
+                'django.template.context_processors.request',
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',

webapp/graphite/render/glyph.py

@@ -19,7 +19,7 @@
 
 from six.moves import range, zip
 from six.moves.urllib.parse import unquote_plus
-from six.moves.configparser import SafeConfigParser
+from six.moves.configparser import ConfigParser
 from django.conf import settings
 import pytz
 import six
@@ -811,7 +811,7 @@ def encodeHeader(self,text):
     self.ctx.restore()
 
   def loadTemplate(self,template):
-    conf = SafeConfigParser()
+    conf = ConfigParser()
     if conf.read(settings.GRAPHTEMPLATES_CONF):
       defaults = defaultGraphOptions
       # If a graphTemplates.conf exists, read in

webapp/graphite/settings.py

@@ -166,7 +166,7 @@
 # Function plugins
 FUNCTION_PLUGINS = []
 
-
+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
 MIDDLEWARE = ()
 if DJANGO_VERSION < (1, 10):
     MIDDLEWARE_CLASSES = MIDDLEWARE