From b6f8ad1a54aa880ce03df9de1838e6e49639431a Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 12 Mar 2019 22:22:04 -0700 Subject: [PATCH] R-2.18.4 --- CHANGELOG | 3 ++- Makefile | 6 +++--- VERSION | 2 +- gluon/packages/dal | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 698ab1d8..e27d5bdc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,8 @@ -## 2.18.1-2.18.3 +## 2.18.1-2.18.4 - pydal 19.02 - made template its own module (Yet Another Template Language) - improved python 3.4-3.7 support +- better regular expressions - bug fixes ## 2.17.1-2 diff --git a/Makefile b/Makefile index a956b637..fba4fbd3 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ clean: find . -name '*.rej' -exec rm -f {} \; find . -name '#*' -exec rm -f {} \; find . -name 'Thumbs.db' -exec rm -f {} \; - find . -name '.tox' -exec rm -rf {} \; - find . -name '__pycache__' -exec rm -rf {} \; + # find . -name '.tox' -exec rm -rf {} \; + # find . -name '__pycache__' -exec rm -rf {} \; find gluon/ -name '*class' -exec rm -f {} \; find applications/admin/ -name '.*' -exec rm -f {} \; find applications/examples/ -name '.*' -exec rm -f {} \; @@ -45,7 +45,7 @@ rmfiles: rm -rf applications/examples/uploads/* src: ### Use semantic versioning - echo 'Version 2.18.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.18.4-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean # make rmfiles diff --git a/VERSION b/VERSION index 1bb72eca..ceadb05f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.18.3-stable+timestamp.2019.03.03.15.06.20 +Version 2.18.4-stable+timestamp.2019.03.12.22.20.22 diff --git a/gluon/packages/dal b/gluon/packages/dal index 91b3fd1e..9d30c5a7 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit 91b3fd1edbc09b2a416641a72a2417a96a36dde4 +Subproject commit 9d30c5a7c65d2fbcf52a9254b9523cba500269dd