diff --git a/graphite_render/render/grammar.py b/graphite_render/render/grammar.py index 6368f43..efb021d 100644 --- a/graphite_render/render/grammar.py +++ b/graphite_render/render/grammar.py @@ -1,10 +1,5 @@ -try: - from packaging.version import Version as StrictVersion -except ImportError: - from distutils.version import StrictVersion - from pyparsing import ( - __version__, alphanums, alphas, CaselessKeyword, CaselessLiteral, Combine, + alphanums, alphas, CaselessKeyword, CaselessLiteral, Combine, delimitedList, FollowedBy, Forward, Group, LineEnd, Literal, OneOrMore, Optional, printables, quotedString, Regex, Word, ZeroOrMore, ) @@ -118,9 +113,5 @@ rightParen )('template') -if StrictVersion(__version__) >= StrictVersion('2.0.0'): - expression <<= Group(template | call | pathExpression)('expression') - grammar <<= expression -else: - expression << (Group(template | call | pathExpression)('expression')) - grammar << expression +expression <<= Group(template | call | pathExpression)('expression') +grammar <<= expression diff --git a/pyproject.toml b/pyproject.toml index b8f5a1f..f2de65e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,10 +36,9 @@ classifiers = [ ] dependencies = [ "Flask", - "packaging", "PyYAML", "cairocffi", - "pyparsing>=1.5.7", + "pyparsing>2.0.0", "pytz", "structlog", "tzlocal",