Fix dependency conflicts (#1550)

This backports changes already made to master via: #1549 and #1548
cookiecutter · May 14, 2021 · 8925d8c · 8925d8c
1 parent 28463db
commit 8925d8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ on:
       - "*"
   pull_request:
     branches:
-      - "*"
+      - "**"
 
 jobs:
   build:

diff --git a/setup.py b/setup.py
@@ -26,14 +26,13 @@
 
 requirements = [
     'binaryornot>=0.4.4',
-    'Jinja2<3.0.0',
+    'Jinja2>=2.7,<4.0.0',
     'click>=7.0',
     'poyo>=0.5.0',
     'jinja2-time>=0.2.0',
     'python-slugify>=4.0.0',
     'requests>=2.23.0',
     'six>=1.10',
-    'MarkupSafe<2.0.0',
 ]
 
 if sys.argv[-1] == 'readme':