Cleaning up tests, adding Jinja tests for skip_common_chunks

Author: karolyi

.circleci/config.yml

@@ -3,67 +3,43 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-3.5-20
-      - test-3.5-21
-      - test-3.5-22
-
-      - test-3.6-20
-      - test-3.6-21
       - test-3.6-22
       - test-3.6-30
       - test-3.6-31
       - test-3.6-32
 
-      - test-3.7-20
-      - test-3.7-21
       - test-3.7-22
       - test-3.7-30
       - test-3.7-31
       - test-3.7-32
 
-      - test-3.8-20
-      - test-3.8-21
       - test-3.8-22
       - test-3.8-30
       - test-3.8-31
       - test-3.8-32
 
-      - test-3.9-20
-      - test-3.9-21
       - test-3.9-22
       - test-3.9-30
       - test-3.9-31
       - test-3.9-32
 
       - done:
           requires:
-            - test-3.5-20
-            - test-3.5-21
-            - test-3.5-22
-
-            - test-3.6-20
-            - test-3.6-21
             - test-3.6-22
             - test-3.6-30
             - test-3.6-31
             - test-3.6-32
 
-            - test-3.7-20
-            - test-3.7-21
             - test-3.7-22
             - test-3.7-30
             - test-3.7-31
             - test-3.7-32
 
-            - test-3.8-20
-            - test-3.8-21
             - test-3.8-22
             - test-3.8-30
             - test-3.8-31
             - test-3.8-32
 
-            - test-3.9-20
-            - test-3.9-21
             - test-3.9-22
             - test-3.9-30
             - test-3.9-31
@@ -118,37 +94,6 @@ jobs:
           environment:
             COVERALLS_PARALLEL: 1
 
-  test-3.5-20:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.5-stretch-node
-    environment:
-      DJANGO_VERSION: "20"
-  test-3.5-21:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.5-stretch-node
-    environment:
-      DJANGO_VERSION: "21"
-  test-3.5-22:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.5-stretch-node
-    environment:
-      DJANGO_VERSION: "22"
-
-  test-3.6-20:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.6-stretch-node
-    environment:
-      DJANGO_VERSION: "20"
-  test-3.6-21:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.6-stretch-node
-    environment:
-      DJANGO_VERSION: "21"
   test-3.6-22:
     <<: *test-template
     docker:
@@ -174,18 +119,6 @@ jobs:
     environment:
       DJANGO_VERSION: "32"
 
-  test-3.7-20:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.7-stretch-node
-    environment:
-      DJANGO_VERSION: "20"
-  test-3.7-21:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.7-stretch-node
-    environment:
-      DJANGO_VERSION: "21"
   test-3.7-22:
     <<: *test-template
     docker:
@@ -211,18 +144,6 @@ jobs:
     environment:
       DJANGO_VERSION: "32"
 
-  test-3.8-20:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.8-buster-node
-    environment:
-      DJANGO_VERSION: "20"
-  test-3.8-21:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.8-buster-node
-    environment:
-      DJANGO_VERSION: "21"
   test-3.8-22:
     <<: *test-template
     docker:
@@ -248,18 +169,6 @@ jobs:
     environment:
       DJANGO_VERSION: "32"
 
-  test-3.9-20:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.9-buster-node
-    environment:
-      DJANGO_VERSION: "20"
-  test-3.9-21:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.9-buster-node
-    environment:
-      DJANGO_VERSION: "21"
   test-3.9-22:
     <<: *test-template
     docker:

requirements-dev.txt

@@ -1,5 +1,5 @@
 twine==3.4.1
-Django==3.2.4
+Django==3.2.7
 django-jinja==2.7.0
 unittest2==1.1.0
 wheel==0.36.2

setup.py

@@ -8,10 +8,11 @@ def rel(*parts):
     '''returns the relative path to a file wrt to the current directory'''
     return os.path.abspath(os.path.join(os.path.dirname(__file__), *parts))
 
-README = open('README.md', 'r').read()
+with open('README.md', 'r') as handler:
+  README = handler.read()
 
 with open(rel('webpack_loader', '__init__.py')) as handler:
-    INIT_PY = handler.read()
+  INIT_PY = handler.read()
 
 
 VERSION = re.findall("__version__ = '([^']+)'", INIT_PY)[0]
@@ -30,7 +31,6 @@ def rel(*parts):
   keywords = ['django', 'webpack', 'assets'], # arbitrary keywords
   classifiers = [
     'Programming Language :: Python',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',

tests/app/templates/home-deduplicated.jinja

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Example</title>
+    {{ render_bundle('app1', 'js') }}
+    {{ render_bundle('app2', 'js', skip_common_chunks=True) }}
+  </head>
+
+  <body>
+    <div id="react-app"></div>
+    {{ render_bundle('app1', 'js', skip_common_chunks=True) }}
+    {{ render_bundle('app2', 'js', skip_common_chunks=True) }}
+  </body>
+</html>