Added django 3.2 support

druids · Jan 3, 2023 · d68696b · d68696b
1 parent 6280e7c
commit d68696b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -13,15 +13,19 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - python-version: 3.6
-            django-version: Django==3.1
-
           - python-version: 3.7
             django-version: Django==3.1
 
           - python-version: 3.8
             django-version: Django==3.1
 
+          - python-version: 3.7
+            django-version: Django==3.2
+
+          - python-version: 3.8
+            django-version: Django==3.2
+
+
     services:
       elasticsearch:
         image: elasticsearch:7.6.2
@@ -49,8 +53,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         cd example
-        pip install -r requirements.txt
         pip install ${{ matrix.django-version }}
+        pip install -r requirements.txt
     - name: Flake
       run: |
         flake8 --config .config/flake8 pyston

diff --git a/example/requirements.txt b/example/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.1.14
+Django<=3.2
 flake8
 coveralls
 html5lib==1.1
@@ -15,6 +15,6 @@ pytz==2020.5
 psycopg2-binary==2.8.6
 elasticsearch==7.13.4
 elasticsearch-dsl==7.4.0
-https://github.com/druids/pynamodb/tarball/AddTagsSupport#egg=pynamodb
+pynamodb==5.3.3
 pydjamodb==0.0.7
 -e ../
diff --git a/pyston/filters/parser.py b/pyston/filters/parser.py
@@ -159,8 +159,8 @@ def parse(self, request):
             pp.QuotedString("'", escChar='\\', unquoteResults=True) | pp.QuotedString('"', escChar='\\',
                                                                                       unquoteResults=True)
         )
-        null = pp.Literal('null').setParseAction(lambda s, l, t: None)
-        boolean = pp.Regex('|'.join(('true', 'false'))).setParseAction(lambda s, l, t: t[0] == 'true')
+        null = pp.Literal('null').setParseAction(lambda _s, _l, _t: None)
+        boolean = pp.Regex('|'.join(('true', 'false'))).setParseAction(lambda _s, _l, _t: _t[0] == 'true')
 
         comparison_term << (string | number | list_term | null | boolean)
 

diff --git a/setup.py b/setup.py
@@ -24,9 +24,9 @@
         'Topic :: Internet :: WWW/HTTP',
     ],
     install_requires=[
-        'django>=2.2,<4.0',
+        'django>=2.2, <4.0',
         'python-mimeparse>=1.6.0',
-        'django-chamber>=0.6.11',
+        'django-chamber>=0.6.16',
         'pyparsing==2.4.7',
         'defusedxml>=0.6.0',
     ],