Release prep for 5.3 beta1

build system fixes
elastic · Oct 27, 2017 · ee81de4 · ee81de4
1 parent 818dccd
commit ee81de4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1,2 +1,2 @@
-__version__ = '5.3.0.alpha1'
+__version__ = '5.3.0b1'
 
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,8 +3,8 @@
 Changelog
 =========
 
-5.3.0.alpha1 (25 October 2017)
-------------------------------
+5.3.0b1 (26 October 2017)
+-------------------------
 
 **New Features**
 
@@ -38,6 +38,7 @@ Changelog
   * Delete the target index (if it exists) in the event that a shrink fails.
     Requested in #1058 (untergeek)
   * Fixed an integration test that could fail in the waning days of a month.
+  * Fix build system anomalies for both unix and windows.
 
 **Documentation**
 

diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,4 +1,4 @@
-:curator_version: 5.3.0.alpha1
+:curator_version: 5.3.0b1
 :curator_major: 5
 :curator_doc_tree: 5.3
 :es_py_version: 5.4.0

diff --git a/unix_packages/build_official_package.sh b/unix_packages/build_official_package.sh
@@ -3,11 +3,8 @@
 BASEPATH=$(pwd)
 PKG_TARGET=/curator_packages
 WORKDIR=/tmp/curator
-CX_VER="5.0.1"
-CX_FILE="/curator_source/unix_packages/cx_freeze-${CX_VER}.dev.tar.gz"
-CX_PATH="anthony_tuininga-cx_freeze-0e565139e6a3"
 PYVER=3.6
-MINOR=2
+MINOR=3
 INPUT_TYPE=python
 CATEGORY=python
 VENDOR=Elastic
@@ -142,14 +139,9 @@ tar zxf ${FILE}
 ${PIPBIN} install -U --user setuptools
 ${PIPBIN} install -U --user requests_aws4auth
 ${PIPBIN} install -U --user boto3
-if [ "${CX_VER}" != "$(${PIPBIN} list | grep cx | awk '{print $2}' | tr -d '()')" ]; then
-  cd ${WORKDIR}
-  rm -rf ${CX_PATH}
-  tar zxf ${CX_FILE}
-  cd ${CX_PATH}
-  ${PIPBIN} install -U --user .
-  cd ${WORKDIR}
-fi
+${PIPBIN} install -U --user cx_freeze
+
+cd ${WORKDIR}
 
 mkdir -p ${PACKAGEDIR}
 cd curator-${1}

diff --git a/unix_packages/build_package_from_source.sh b/unix_packages/build_package_from_source.sh
@@ -3,11 +3,8 @@
 BASEPATH=$(pwd)
 PKG_TARGET=/curator_packages
 WORKDIR=/tmp/curator
-CX_VER="5.0.1"
-CX_FILE="/curator_source/unix_packages/cx_freeze-${CX_VER}.dev.tar.gz"
-CX_PATH="anthony_tuininga-cx_freeze-0e565139e6a3"
 PYVER=3.6
-MINOR=2
+MINOR=3
 INPUT_TYPE=python
 CATEGORY=python
 VENDOR=Elastic
@@ -78,7 +75,7 @@ if [ "${1}x" == "x" ]; then
   echo "Must provide version number (can be arbitrary)"
   exit 1
 else
-  cd ..
+  cd $(dirname $0)/..
   SOURCE_DIR=$(pwd)
 fi
 
@@ -139,14 +136,7 @@ fi
 ${PIPBIN} install -U --user setuptools
 ${PIPBIN} install -U --user requests_aws4auth
 ${PIPBIN} install -U --user boto3
-if [ "${CX_VER}" != "$(${PIPBIN} list | grep cx | awk '{print $2}' | tr -d '()')" ]; then
-  cd ${WORKDIR}
-  rm -rf ${CX_PATH}
-  tar zxf ${CX_FILE}
-  cd ${CX_PATH}
-  ${PIPBIN} install -U --user .
-  cd ${WORKDIR}
-fi
+${PIPBIN} install -U --user cx_freeze
 
 cd $SOURCE_DIR