From 9e7b2b0b0bede95f7610bee765446da60698252c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 3 Mar 2019 15:02:35 -0800
Subject: [PATCH] R-2.18.3

---
 CHANGELOG |  2 +-
 Makefile  | 27 ++++++++++++++-------------
 VERSION   |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1500e53a..698ab1d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-## 2.18.1-2.18.2
+## 2.18.1-2.18.3
 - pydal 19.02
 - made template its own module (Yet Another Template Language)
 - improved python 3.4-3.7 support
diff --git a/Makefile b/Makefile
index af624c68..eec9cbe9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,18 @@ clean:
 	rm -f httpserver.log 
 	rm -f parameters*.py 
 	rm -f -r applications/*/compiled
-	find ./ -name '*~' -exec rm -f {} \; 
-	find ./ -name '*.orig' -exec rm -f {} \; 
-	find ./ -name '*.rej' -exec rm -f {} \; 
-	find ./ -name '#*' -exec rm -f {} \;
-	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	# find ./gluon/ -name '.*' -exec rm -f {} \;
-	find ./gluon/ -name '*class' -exec rm -f {} \; 
-	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
-	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
-	find ./applications/welcome/ -name '.*' -exec rm -f {} \; 
-	find ./ -name '*.pyc' -exec rm -f {} \;
+	find . -name '*~' -exec rm -f {} \; 
+	find . -name '*.orig' -exec rm -f {} \; 
+	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 gluon/ -name '*class' -exec rm -f {} \; 
+	find applications/admin/ -name '.*' -exec rm -f {} \; 
+	find applications/examples/ -name '.*' -exec rm -f {} \; 
+	find applications/welcome/ -name '.*' -exec rm -f {} \; 
+	find . -name '*.pyc' -exec rm -f {} \;
 tests:
 	python web2py.py --run_system_tests
 coverage:
@@ -44,9 +45,9 @@ rmfiles:
 	rm -rf applications/examples/uploads/* 
 src:
 	### Use semantic versioning
-	echo 'Version 2.18.2-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.18.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
-	#make clean
+	make clean
 	# make rmfiles
 	### make welcome layout and appadmin the default
 	cp applications/welcome/views/appadmin.html applications/admin/views
diff --git a/VERSION b/VERSION
index d20e228b..0063c6bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.18.2-stable+timestamp.2019.02.25.21.46.30
+Version 2.18.3-stable+timestamp.2019.03.03.14.46.34