Support of Python3.9 added

yevrah · Jun 26, 2022 · aec222f · aec222f
1 parent fd2fff8
commit aec222f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/bin/app-kitchen-sink b/bin/app-kitchen-sink
@@ -8,6 +8,8 @@ export PYTHONPATH=$PWD
 mkdir -p .simplerr
 python3 -m venv .simplerr/env-ks
 source .simplerr/env-ks/bin/activate
+
+python -m pip install --upgrade pip setuptools wheel
 pip install -r requirements.txt
 
 # go to quickstart, setup db and start

diff --git a/bin/app-quickstart b/bin/app-quickstart
@@ -5,9 +5,13 @@ cd $(git rev-parse --show-toplevel)
 export PYTHONPATH=$PWD
 
 # Setup env for project
+rm -rf .simplerr
 mkdir -p .simplerr
 python3 -m venv .simplerr/env-qs
 source .simplerr/env-qs/bin/activate
+
+
+python -m pip install --upgrade pip setuptools wheel
 pip install -r requirements.txt
 
 # go to quickstart, setup db and start

diff --git a/bin/deploy b/bin/deploy
@@ -20,7 +20,7 @@ environment() {
     pip install twine
 
     log "we might need wheel"
-    pip install wheel
+    python -m pip install --upgrade pip setuptools wheel
 }
 
 build() {
@@ -42,5 +42,4 @@ log() {
     printf "\n👉 $*\n"
 }
 
-
 main
diff --git a/bin/tests b/bin/tests
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 main() {
     setup      `# test boilerplate`
@@ -10,9 +11,12 @@ main() {
 setup() {
     cd $(git rev-parse --show-toplevel)
 
+    rm -rf .simplerr
     mkdir -p .simplerr
     python3 -m venv .simplerr/env-tests
     source .simplerr/env-tests/bin/activate
+
+    python -m pip install --upgrade pip setuptools wheel
     pip install -r requirements.txt
     pip install colour_runner flake8
 }
@@ -43,7 +47,7 @@ runtest() {
     echo ""
     echo "---------------------------"
     echo "Linted top 10 items"
-    flake8 --config=.flake8 simplerr | head -n 10
+    # flake8 --config=.flake8 simplerr | head -n 10
     echo "---------------------------"
 }
 

diff --git a/examples/quickstart/people.db b/examples/quickstart/people.db
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
+markupsafe==2.0.1
 click==7.0
 Jinja2==2.11.3
 peewee==3.13.3
 Werkzeug==0.16.0
-wheel==0.34.2
diff --git a/setup.py b/setup.py
@@ -73,11 +73,11 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
+        "markupsafe==2.0.1",
         "click==7.0",
-        "Jinja2==2.10.3",
+        "Jinja2==2.11.3",
         "peewee==3.13.3",
         "Werkzeug==0.16.0",
-        "wheel==0.34.2",
     ],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,

diff --git a/simplerr/__init__.py b/simplerr/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.17.9"
+__version__ = "0.17.10"
 
 # Import Core Web
 from .web import web