From 3113a1919ad8585f390eccc71f190cf1281b5ead Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Wed, 24 Jan 2018 13:54:55 +0900
Subject: [PATCH] version up: tensorboard 0.4.0
---
component/tensorboard/{0.4.patch => 0.4.0.patch} | 16 ++++++++--------
component/tensorboard/buildout.cfg | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
rename component/tensorboard/{0.4.patch => 0.4.0.patch} (64%)
diff --git a/component/tensorboard/0.4.patch b/component/tensorboard/0.4.0.patch
similarity index 64%
rename from component/tensorboard/0.4.patch
rename to component/tensorboard/0.4.0.patch
index a64674bf7..035a24815 100644
--- a/component/tensorboard/0.4.patch
+++ b/component/tensorboard/0.4.0.patch
@@ -1,5 +1,5 @@
diff --git a/tensorboard/pip_package/build_pip_package.sh b/tensorboard/pip_package/build_pip_package.sh
-index b386d59..f03b056 100755
+index 88fb5a2..782dbc5 100755
--- a/tensorboard/pip_package/build_pip_package.sh
+++ b/tensorboard/pip_package/build_pip_package.sh
@@ -26,6 +26,7 @@ function main() {
@@ -10,14 +10,14 @@ index b386d59..f03b056 100755
echo $(date) : "=== Using tmpdir: ${TMPDIR}"
-@@ -45,8 +46,8 @@ function main() {
+@@ -44,9 +45,7 @@ function main() {
+ pushd ${TMPDIR} >/dev/null
rm -f MANIFEST
- echo $(date) : "=== Building wheel"
- echo $(pwd)
-- python setup.py bdist_wheel >/dev/null
-- python3 setup.py bdist_wheel >/dev/null
+ echo $(date) : "=== Building python2 wheel in $PWD"
+- python setup.py bdist_wheel --python-tag py2 >/dev/null
+- echo $(date) : "=== Building python3 wheel in $PWD"
+- python setup.py bdist_wheel --python-tag py3 >/dev/null
+ PYTHONPATH=${WORKDIR}/${RUNFILES} $PYTHON_BIN_PATH setup.py bdist_egg >/dev/null
-+ #python3 setup.py bdist_wheel >/dev/null
mkdir -p ${DEST}
cp dist/* ${DEST}
- popd
+ popd >/dev/null
diff --git a/component/tensorboard/buildout.cfg b/component/tensorboard/buildout.cfg
index cfa6a5327..f50086de4 100644
--- a/component/tensorboard/buildout.cfg
+++ b/component/tensorboard/buildout.cfg
@@ -11,11 +11,11 @@ parts =
recipe = plone.recipe.command
stop-on-error = true
repository = https://github.com/tensorflow/tensorboard
-tag = 0.4
+tag = 0.4.0
git-binary = ${git:location}/bin/git
patch-binary = ${patch:location}/bin/patch
location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = export HOME=${:location}; (${:git-binary} clone --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/0.4.patch ) || (rm -fr ${:location}; exit 1)
+command = export HOME=${:location}; (${:git-binary} clone --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/0.4.0.patch ) || (rm -fr ${:location}; exit 1)
[tensorboard-build]
recipe = slapos.recipe.build
@@ -61,7 +61,7 @@ numpy-python-command = ${buildout:bin-directory}/${numpy-egg:interpreter}
script =
os.makedirs(location)
workdir = self.options['tensorboard-repository-path']
- egg_name = 'tensorflow_tensorboard-0.4.0rc3-py2.7.egg'
+ egg_name = 'tensorflow_tensorboard-0.4.0-py2.7.egg'
dist_dir = os.path.join(workdir, 'dist')
dest_dir = os.path.join(self.buildout['buildout']['eggs-directory'], egg_name)
env = {'PATH':':'.join([self.options['bazel-bin'],
--
2.30.9