10.1

lib/steps/odoo-install

@@ -6,65 +6,56 @@ GITHUB_URL="https://github.com"
 ODOO_REPO=`$JQ -r .odoo.repo ./odooku.json`
 ODOO_BRANCH=`$JQ -r .odoo.branch ./odooku.json`
 ODOO_COMMIT=`$JQ -r .odoo.commit ./odooku.json`
+PYTHONHOME="/app/.heroku/python/lib/python2.7"
+PYTHONPATH="/app/.heroku/python/lib/python2.7"
 
 if [ $ODOO_COMMIT == "null" ]; then
   # Grab latest commit from github api
   ODOO_COMMIT=`curl -s $GITHUB_API_URL/repos/$ODOO_REPO/commits/$ODOO_BRANCH  2> /dev/null | $JQ -r '.sha'`
   puts-line "Using latest commit $ODOO_REPO (${ODOO_BRANCH}) @ (${ODOO_COMMIT})"
 fi
 
-COMPAT_REPO=`$JQ -r .compat.repo ./odooku.json`
-COMPAT_BRANCH=`$JQ -r .compat.branch ./odooku.json`
-COMPAT_COMMIT=`$JQ -r .compat.commit ./odooku.json`
-
-if [ $COMPAT_COMMIT == "null" ]; then
-  # Grab latest commit from github api
-  COMPAT_COMMIT=`curl -s $GITHUB_API_URL/repos/$COMPAT_REPO/commits/$COMPAT_BRANCH  2> /dev/null | $JQ -r '.sha'`
-  puts-line "Using latest commit $COMPAT_REPO (${COMPAT_BRANCH}) @ (${COMPAT_COMMIT})"
-fi
-
 # Create final stack
-STACK="{\"odoo\":{\"repo\": \"$ODOO_REPO\", \"branch\": \"$ODOO_BRANCH\", \"commit\": \"$ODOO_COMMIT\"},\"compat\": {\"repo\": \"$COMPAT_REPO\", \"branch\": \"$COMPAT_BRANCH\", \"commit\": \"$COMPAT_COMMIT\"}}"
+STACK="{\"odoo\":{\"repo\": \"$ODOO_REPO\", \"branch\": \"$ODOO_BRANCH\", \"commit\": \"$ODOO_COMMIT\"}}"
 
-# See if anything has chanfed
-if [ ! -f ".heroku/odoo/stack/odooku.json" ] || [ `echo $STACK | $JQ -cS .` != `$JQ -cS . .heroku/odoo/stack/odooku.json` ] || [ -d "./patch" ]; then
+# See if anything has changed
+if [ ! -f ".heroku/odoo/stack.json" ] || [ `echo $STACK | $JQ -cS .` != `$JQ -cS . .heroku/odoo/stack.json` ]; then
 
   puts-line "New Odoo installation detected"
   ODOO_ARCHIVE="$GITHUB_URL/$ODOO_REPO/archive/$ODOO_COMMIT.tar.gz"
-  COMPAT_ARCHIVE="$GITHUB_URL/$COMPAT_REPO/archive/$COMPAT_COMMIT.tar.gz"
 
-  mkdir ./odoo_tmp ./compat_tmp
+  mkdir ./odoo_tmp
   puts-line "Fetching $ODOO_REPO (${ODOO_BRANCH}) @ (${ODOO_COMMIT})"
   curl -sL $ODOO_ARCHIVE 2> /dev/null | tar xz -C ./odoo_tmp --strip 1
-  puts-line "Fetching $COMPAT_REPO (${COMPAT_BRANCH}) @ (${COMPAT_COMMIT})"
-  curl -sL $COMPAT_ARCHIVE 2> /dev/null | tar xz -C ./compat_tmp --strip 1
-
-  puts-step "Installing Odoo"
-  puts-line "Applying Odooku patches"
-  cp -a ./compat_tmp/patch/. ./odoo_tmp/
-  if [ -d "./patch" ]; then
-    puts-line "Applying patches in ./patch"
-    cp -a ./patch/. ./odoo_tmp/
-  fi
 
-  puts-line "Running Odooku runtime setup.py"
-  pip install --upgrade --no-dependencies --src=./.heroku/src --disable-pip-version-check --no-cache-dir ./compat_tmp/runtime 2>&1 | tee $WARNINGS_LOG | cleanup-pip-output | indent
+  puts-line "Check python version"
+  python --version
+
+  puts-line "Check python path"
+  puts-line $PYTHONPATH
+
+  puts-line "Check python home"
+  puts-line $PYTHONHOME
+
+  puts-line "Find python"
+  find . -name python
+
+  puts-line "Check where im I"
+  pwd
+  ls -la
+
+  puts-line "find pip"
+  find . -name pip
+  puts-line "pip version"
+  python -m pip --version
+
   puts-line "Running Odoo setup.py"
   pip install --upgrade --no-dependencies --src=./.heroku/src --disable-pip-version-check --no-cache-dir ./odoo_tmp 2>&1 | tee $WARNINGS_LOG | cleanup-pip-output | indent
-  rm -rf .heroku/odoo/addons .heroku/odoo/compat_addons &> /dev/null || true
+  rm -rf .heroku/odoo/addons &> /dev/null || true
   mv ./odoo_tmp/addons .heroku/odoo/addons
-  mv ./compat_tmp/addons .heroku/odoo/compat_addons
 
   # Keep stack
-  mkdir -p .heroku/odoo/stack
-  echo $STACK > .heroku/odoo/stack/odooku.json
-
-  # Move over requirements, unless they are already provided by the app
-  if [ ! -f "./compat_requirements.txt" ]; then
-    cp ./compat_tmp/requirements.txt ./compat_requirements.txt
-  else
-    puts-line "Detected custom compat_requirements.txt"
-  fi
+  echo $STACK > .heroku/odoo/stack.json
 
   if [ ! -f "./odoo_requirements.txt" ]; then
     cp ./odoo_tmp/requirements.txt ./odoo_requirements.txt
@@ -73,16 +64,18 @@ if [ ! -f ".heroku/odoo/stack/odooku.json" ] || [ `echo $STACK | $JQ -cS .` != `
   fi
 
   # Cleanup
-  rm -rf ./odoo_tmp ./compat_tmp
+  rm -rf ./odoo_tmp
 else
   puts-line "Odoo installation is up to date"
 fi
 
 # Export additional requirements
-export REQUIREMENTS="$REQUIREMENTS odoo_requirements.txt compat_requirements.txt"
+export REQUIREMENTS="$REQUIREMENTS odoo_requirements.txt"
 
 # Export addon locations
-export ODOOKU_ADDONS="$HOME/.heroku/odoo/lib/python2.7/site-packages/openerp/addons,$HOME/.heroku/odoo/compat_addons,$HOME/.heroku/odoo/addons"
+export ODOOKU_ADDONS="$HOME/.heroku/odoo/lib/python2.7/site-packages/odoo/addons,$HOME/.heroku/odoo/addons"
 if [ -d "./addons" ]; then
-  export ODOOKU_ADDONS="$ODOOKU_ADDONS,$HOME/addons"
+  puts-line "Detected addons directory"
+  # add custom module paths here
+  export ODOOKU_ADDONS="$ODOOKU_ADDONS,$HOME/addons,$HOME/addons/vittal_odoo_modules"
 fi

lib/steps/runtimes/python

@@ -1,8 +1,49 @@
 #!/usr/bin/env bash
-ARCHIVE="https://odooku.s3.amazonaws.com/runtimes/python-2.7.12.tar.gz"
+#ARCHIVE="https://odooku.s3.amazonaws.com/runtimes/python-2.7.12.tar.gz"
+ARCHIVE="https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tgz"
 
-if [ ! -f ".heroku/odoo/bin/python" ]; then
-  puts-step "Bootstrapping python"
-  mkdir -p .heroku/odoo
-  curl -s $ARCHIVE 2> /dev/null | tar zxv -C .heroku/odoo &> /dev/null
-fi
+puts-line "Inside runtimes/python"
+
+
+# if [ ! -f ".heroku/odoo/bin/python" ]; then
+#   puts-step "Bootstrapping python"
+#   mkdir -p .heroku/odoo
+#   curl -s $ARCHIVE 2> /dev/null | tar zxv -C .heroku/odoo &> /dev/null
+#   ls -la
+#   pwd
+#   puts-line "After curl python"
+#   python --version
+#   #python -m ensurepip --upgrade
+#   #pip --version
+# fi
+
+
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/odoo/
+
+# OUT_PREFIX=$1
+
+# PYTHON_VERSION=2.7.17
+
+# echo "-----> Building Python ${PYTHON_VERSION}"
+# curl -L https://python.org/ftp/python/2.7.17/Python-${PYTHON_VERSION}.tgz | tar xz
+# pushd Python-${PYTHON_VERSION}
+# ./configure --prefix=${OUT_PREFIX}
+# make -s
+# make install -s
+# popd
+
+# PYTHONHOME=${OUT_PREFIX} ${OUT_PREFIX}/bin/python -m ensurepip
+
+puts-step "Bootstrapping python - pip"
+wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
+pwd
+ls -la
+puts-step "Install pip"
+python -m get-pip.py
+
+puts-step "Proof pip"
+find . -name pip
+
+puts-step "pip version"
+pip --version

workspace/runtimes/python-2.7.12 → workspace/runtimes/python-2.7.17

@@ -3,10 +3,10 @@
 
 OUT_PREFIX=$1
 
-PYTHON_VERSION=2.7.12
+PYTHON_VERSION=2.7.17
 
 echo "-----> Building Python ${PYTHON_VERSION}"
-curl -L https://python.org/ftp/python/2.7.12/Python-${PYTHON_VERSION}.tgz | tar xz
+curl -L https://python.org/ftp/python/2.7.17/Python-${PYTHON_VERSION}.tgz | tar xz
 pushd Python-${PYTHON_VERSION}
 ./configure --prefix=${OUT_PREFIX}
 make -s