diff --git a/VERSION b/VERSION index eea5773ebc..ad1801b64c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -nursix-dev-5585-g503b674b1 (2023-02-10 14:44:14) +5.1-70-g2630adfd5 (2023-02-14 16:13:04) diff --git a/tests/travis/install_web2py.sh b/tests/travis/install_web2py.sh index 49f227bfad..14dc68ab3a 100644 --- a/tests/travis/install_web2py.sh +++ b/tests/travis/install_web2py.sh @@ -14,8 +14,8 @@ echo "=================================" # Handle for the checkout-directory (different paths for different repos) BRANCH_HOME=`pwd` -# Use web2py-2.23.0-stable -WEB2PY_COMMIT=f24039867 +# Use web2py-2.23.1-stable +WEB2PY_COMMIT=7af5c2b # Clone web2py under build home (usually /home/travis/build) cd ../.. @@ -30,24 +30,24 @@ fi # Patch web2py/PyDAL PYDAL=gluon/packages/dal/pydal -case $WEB2PY_COMMIT in - 59700b8 ) - # 2.18.5 patches - - # Scheduler (not needed for CI since not running scheduler) - #cd gluon - #wget http://eden.sahanafoundation.org/downloads/scheduler.diff - #patch -p0 < scheduler.diff - #cd .. - - # Shell (see https://github.com/web2py/web2py/issues/2292) - git apply $BRANCH_HOME/tests/travis/shell-2.18.5.diff - - # PyDAL - sed -i "s|if getattr(func, 'validate', None) is Validator.validate:|if getattr(func, 'validate', None) is not Validator.validate:|" $PYDAL/validators.py - sed -i "s|\['password'\]|['passwd']|" $PYDAL/adapters/mysql.py - ;; -esac +#case $WEB2PY_COMMIT in +# 59700b8 ) +# # 2.18.5 patches +# +# # Scheduler (not needed for CI since not running scheduler) +# #cd gluon +# #wget http://eden.sahanafoundation.org/downloads/scheduler.diff +# #patch -p0 < scheduler.diff +# #cd .. +# +# # Shell (see https://github.com/web2py/web2py/issues/2292) +# git apply $BRANCH_HOME/tests/travis/shell-2.18.5.diff +# +# # PyDAL +# sed -i "s|if getattr(func, 'validate', None) is Validator.validate:|if getattr(func, 'validate', None) is not Validator.validate:|" $PYDAL/validators.py +# sed -i "s|\['password'\]|['passwd']|" $PYDAL/adapters/mysql.py +# ;; +#esac # Return to build home and fix permissions cd ..