Skip to content

Commit c4dcf0f

Browse files
committed
Fix pyparsing dep version (fixing graphite-project#2834)
1 parent 893c45c commit c4dcf0f

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

check-dependencies.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
required = 0
1111
optional = 0
1212

13+
def versiontuple(v):
14+
return tuple(map(int, (v.split("."))))
1315

1416
# Test for whisper
1517
try:
@@ -92,6 +94,10 @@
9294
sys.stderr.write("[REQUIRED] Unable to import the 'pyparsing' module, "
9395
"do you have pyparsing module installed for python %s?\n" % sys.version_info.major)
9496
required += 1
97+
if versiontuple(pyparsing.__version__) < versiontuple("2.3.0"):
98+
sys.stderr.write("[REQUIRED] You have pyparsing version %s installed, "
99+
"but version 2.3.0 or greater is required\n" % pyparsing.__version__)
100+
required += 1
95101

96102

97103
# Test for django-tagging
@@ -103,9 +109,9 @@
103109
required += 1
104110

105111

106-
if django and django.VERSION[:2] < (1,8):
112+
if django and django.VERSION[:2] < (4,2):
107113
sys.stderr.write("[REQUIRED] You have django version %s installed, "
108-
"but version 1.8 or greater is required\n" % django.get_version())
114+
"but version 4.2 or greater is required\n" % django.get_version())
109115
required += 1
110116

111117

docs/install.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ been met or not.
3333
Basic Graphite requirements:
3434

3535
* a UNIX-like Operating System
36-
* Python 2.7 or greater (including experimental Python3 support)
36+
* Python 3.8 or greater
3737
* `cairocffi`_
38-
* `Django`_ 1.8 - 2.2 (for Python3 - 1.11 and newer), 1.11.19 or newer is recommended
39-
* `django-tagging`_ 0.4.6 (not `django-taggit` yet)
38+
* `Django`_ 4.2+
39+
* `django-tagging`_ 0.4.6 (not `django-taggit`, unfortunately)
4040
* `pytz`_
41-
* `scandir`_ (for Python older than 3.5)
41+
* `pyparsing` 2.3.0+
4242
* `fontconfig`_ and at least one font package (a system package usually)
4343
* A WSGI server and web server. Popular choices are:
4444

0 commit comments

Comments
 (0)