From 9cd5ca2c495cc5a6e3a96a673c63508cf4014935 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 6 Jan 2014 09:56:21 -0500 Subject: [PATCH 01/21] Packaging stuff for Django --- .gitignore | 4 ++++ __init__.py | 0 setup.py | 45 ++++++++++++++++++++++++++++++++++++++++++++ static/treeRepeat/js | 1 + 4 files changed, 50 insertions(+) create mode 100644 __init__.py create mode 100644 setup.py create mode 120000 static/treeRepeat/js diff --git a/.gitignore b/.gitignore index b8121a2..ce35b57 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ build.xml .project .settings .idea/* +*~ +*pyc +build +build/* \ No newline at end of file diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..00fcd4d --- /dev/null +++ b/setup.py @@ -0,0 +1,45 @@ +import os +from os.path import join, dirname +from distutils.core import setup + +def recursiveFileGenerator(rootDir): + """Recursively yield every file within the specified directory.""" + for folder, subs, files in os.walk(rootDir): + for fileName in files: + dummy,dummy,result = os.path.join(folder,fileName).partition("/") + yield result + +def makeRecursiveFileList(rootDir): + """Return a list of every file within the specified directory.""" + return list(recursiveFileGenerator(rootDir)) + +try: + f = open(join(dirname(__file__), 'README.rst')) + long_description = f.read().strip() + f.close() +except IOError: + long_description = None + +setup( + name='django-angualar-treeRepeat', + version='0.1', + url="https://github.com/tchatel/angular-treeRepeat", + description="tchatel's angular-treeRepeat packaged in a handy django app to speed up new applications and reduce duplication.", + long_description=long_description, + author='---', + author_email='---', + keywords='django angular tree treeRepeat'.split(), + platforms='any', + classifiers=[ + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Utilities', + ], + packages=['treeRepeat'], + package_dir={'treeRepeat':'.'}, + package_data={'treeRepeat':['static/treeRepeat/js/*.js',]}, +) diff --git a/static/treeRepeat/js b/static/treeRepeat/js new file mode 120000 index 0000000..1cc8d3c --- /dev/null +++ b/static/treeRepeat/js @@ -0,0 +1 @@ +../../app/js \ No newline at end of file From 70712e6ae66031e71b8df9bec19cedad3df1221d Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 6 Jan 2014 09:57:40 -0500 Subject: [PATCH 02/21] Add newline to end of .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce35b57..d2e8151 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ build.xml *~ *pyc build -build/* \ No newline at end of file +build/* From 16e9ee37c7aa0133ecd0ea114a237afd7cb9ffcd Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 6 Jan 2014 10:16:23 -0500 Subject: [PATCH 03/21] Use these directives with CaseRailsApp --- app/js/directives.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/js/directives.js b/app/js/directives.js index c67e221..1cfa16d 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1,6 +1,9 @@ 'use strict'; +// Don't push this change upstream; it just attaches the +// tree directives to the CaseRails app rather than the demo app. +angular.module('caserailsApp.directives') +// End: Don't push -angular.module('app.directives', []) // Main directive, that just publish a controller .directive('tree', function ($parse, $animate) { From f6d59a1c823578cadbd6ae42b2adc3090af8b63b Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sat, 11 Jan 2014 21:56:29 -0500 Subject: [PATCH 04/21] Initial CI commit --- .gitignore | 20 +++++++++----------- build.sh | 3 +++ deploy.sh | 5 +++++ requirements.txt | 2 ++ setup.py | 3 ++- test.sh | 3 +++ 6 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 build.sh create mode 100644 deploy.sh create mode 100644 requirements.txt create mode 100644 test.sh diff --git a/.gitignore b/.gitignore index d2e8151..e6fee5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,10 @@ -**/.DS_Store -nbproject -manifest.mf -build.xml - -.project -.settings -.idea/* +*.egg-info *~ -*pyc -build -build/* +*.pot +*.py[co] +MANIFEST +dist/ +docs/_build/ +tests/coverage_html/ +tests/.coverage +build/ \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..83117e9 --- /dev/null +++ b/build.sh @@ -0,0 +1,3 @@ +echo "Installing Build Requirements" +pip install -r requirements.txt +python setup.py bdist_wheel diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..c923e0a --- /dev/null +++ b/deploy.sh @@ -0,0 +1,5 @@ +curl https://raw2.github.com/CaseRails/ci_scripts/master/deploy.py > deploy.py +curl https://raw2.github.com/CaseRails/ci_scripts/master/requirements.txt > deploy_requirements.txt + +pip install -r deploy_requirements.txt +python deploy.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..18e19ea --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +wheel +setuptools diff --git a/setup.py b/setup.py index 00fcd4d..fe6ebdf 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ import os from os.path import join, dirname -from distutils.core import setup +from setuptools import setup, find_packages def recursiveFileGenerator(rootDir): """Recursively yield every file within the specified directory.""" @@ -23,6 +23,7 @@ def makeRecursiveFileList(rootDir): setup( name='django-angualar-treeRepeat', version='0.1', + zip_safe=False, url="https://github.com/tchatel/angular-treeRepeat", description="tchatel's angular-treeRepeat packaged in a handy django app to speed up new applications and reduce duplication.", long_description=long_description, diff --git a/test.sh b/test.sh new file mode 100644 index 0000000..dbfa1b5 --- /dev/null +++ b/test.sh @@ -0,0 +1,3 @@ +echo "Testing" +pip install --use-wheel --find-links=dist/ django-angular-treeRepeat +echo "import treeRepeat; print 'Hello World';" | python From a98afb742940189b1e67b8dff44cd39da415df9c Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sat, 11 Jan 2014 22:00:46 -0500 Subject: [PATCH 05/21] Fix misspelling of package name --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fe6ebdf..98916f1 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def makeRecursiveFileList(rootDir): long_description = None setup( - name='django-angualar-treeRepeat', + name='django-angular-treeRepeat', version='0.1', zip_safe=False, url="https://github.com/tchatel/angular-treeRepeat", From 7132607c09c40a157bc69f34d02e6fcdc257e88a Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sat, 11 Jan 2014 22:03:07 -0500 Subject: [PATCH 06/21] Status --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6c21945..be21cb1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Recursive repeater for AngularJS ## or how to build a tree by hand +[ ![Codeship Status for CaseRails/django-angular-treeRepeat](https://www.codeship.io/projects/f88a4640-5d62-0131-692d-2a0738b6ecf1/status?branch=master)](https://www.codeship.io/projects/11978) + Demo is here : http://tchatel.github.io/angular-treeRepeat/ From b6e75d95d313ece8570192502165f271c86c16ee Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sun, 12 Jan 2014 14:27:19 -0500 Subject: [PATCH 07/21] Update CI Scripts --- build.sh | 9 ++++++++- deploy.sh | 4 ---- test.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 83117e9..32dcca0 100644 --- a/build.sh +++ b/build.sh @@ -1,3 +1,10 @@ echo "Installing Build Requirements" -pip install -r requirements.txt +curl https://raw2.github.com/CaseRails/ci_scripts/master/ci_requirements.txt >> requirements.txt +curl -O https://raw2.github.com/CaseRails/ci_scripts/master/build_artifacts.py +curl -O https://raw2.github.com/CaseRails/ci_scripts/master/deploy.py +curl -O https://raw2.github.com/CaseRails/ci_scripts/master/deploy_wheels.py +curl -O https://raw2.github.com/CaseRails/ci_scripts/master/get_env_vars.py +curl -O https://raw2.github.com/CaseRails/ci_scripts/master/retrieve.py +sort -u requirements.txt > sorted_requirements.txt +pip install -r sorted_requirements.txt python setup.py bdist_wheel diff --git a/deploy.sh b/deploy.sh index c923e0a..3caf2fb 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,5 +1 @@ -curl https://raw2.github.com/CaseRails/ci_scripts/master/deploy.py > deploy.py -curl https://raw2.github.com/CaseRails/ci_scripts/master/requirements.txt > deploy_requirements.txt - -pip install -r deploy_requirements.txt python deploy.py diff --git a/test.sh b/test.sh index dbfa1b5..70d3fa3 100644 --- a/test.sh +++ b/test.sh @@ -1,3 +1,3 @@ echo "Testing" -pip install --use-wheel --find-links=dist/ django-angular-treeRepeat +pip install --use-wheel --find-links=dist/ $PACKAGE_NAME echo "import treeRepeat; print 'Hello World';" | python From 76f35699ba67e2be2b7e5ff848e82888dd9370d9 Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sun, 12 Jan 2014 17:20:38 -0500 Subject: [PATCH 08/21] Stricter CI scripts --- build.sh | 2 ++ deploy.sh | 1 + requirements.txt | 2 -- test.sh | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 requirements.txt diff --git a/build.sh b/build.sh index 32dcca0..c1118ad 100644 --- a/build.sh +++ b/build.sh @@ -1,3 +1,5 @@ +set -e + echo "Installing Build Requirements" curl https://raw2.github.com/CaseRails/ci_scripts/master/ci_requirements.txt >> requirements.txt curl -O https://raw2.github.com/CaseRails/ci_scripts/master/build_artifacts.py diff --git a/deploy.sh b/deploy.sh index 3caf2fb..6338829 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1 +1,2 @@ +set -e python deploy.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 18e19ea..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -wheel -setuptools diff --git a/test.sh b/test.sh index 70d3fa3..ae57936 100644 --- a/test.sh +++ b/test.sh @@ -1,3 +1,5 @@ +set -e + echo "Testing" pip install --use-wheel --find-links=dist/ $PACKAGE_NAME echo "import treeRepeat; print 'Hello World';" | python From f21529f0be1c495175316432a6ed9210c533fcc7 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 13 Jan 2014 09:44:05 -0500 Subject: [PATCH 09/21] Testing Deployment --- build.sh | 1 + test.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c1118ad..4a3dba8 100644 --- a/build.sh +++ b/build.sh @@ -10,3 +10,4 @@ curl -O https://raw2.github.com/CaseRails/ci_scripts/master/retrieve.py sort -u requirements.txt > sorted_requirements.txt pip install -r sorted_requirements.txt python setup.py bdist_wheel +python setup.py bdist_egg diff --git a/test.sh b/test.sh index ae57936..4e99179 100644 --- a/test.sh +++ b/test.sh @@ -1,5 +1,5 @@ set -e echo "Testing" -pip install --use-wheel --find-links=dist/ $PACKAGE_NAME +pip install --find-links=dist/ $PACKAGE_NAME echo "import treeRepeat; print 'Hello World';" | python From 044bf6c3dfeca26a986fa02d1b30f70ec50ca8e0 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 18:55:59 -0500 Subject: [PATCH 10/21] PIP Configuration --- build.sh | 33 ++++++++++++++++++++++----------- deploy.sh | 7 ++++++- test.sh | 13 +++++++++---- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/build.sh b/build.sh index 4a3dba8..1b75946 100644 --- a/build.sh +++ b/build.sh @@ -1,13 +1,24 @@ -set -e - -echo "Installing Build Requirements" -curl https://raw2.github.com/CaseRails/ci_scripts/master/ci_requirements.txt >> requirements.txt -curl -O https://raw2.github.com/CaseRails/ci_scripts/master/build_artifacts.py -curl -O https://raw2.github.com/CaseRails/ci_scripts/master/deploy.py -curl -O https://raw2.github.com/CaseRails/ci_scripts/master/deploy_wheels.py -curl -O https://raw2.github.com/CaseRails/ci_scripts/master/get_env_vars.py -curl -O https://raw2.github.com/CaseRails/ci_scripts/master/retrieve.py -sort -u requirements.txt > sorted_requirements.txt -pip install -r sorted_requirements.txt +set -x +mkdir -p ~/.pip_cache +export ORIGINAL_HOME=`pwd` +export ORIGINAL_PACKAGE_NAME=$PACKAGE_NAME +export PIP_DOWNLOAD_CACHE=~/.pip_cache/ +export CI_DIST=~/clone/ci_scripts/dist +export PACKAGE_DIST=~/clone/dist +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" +pip install --upgrade pip setuptools +export PIP=`which pip` +echo "Post-Upgrade PIP Version:" +$PIP -V +git clone https://github.com/CaseRails/ci_scripts.git +cd ci_scripts +./build.sh +./test.sh +cd $ORIGINAL_HOME +export PACKAGE_NAME=$ORIGINAL_PACKAGE_NAME +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST" +$PIP install ci_scripts +python setup.py clean +python setup.py build python setup.py bdist_wheel python setup.py bdist_egg diff --git a/deploy.sh b/deploy.sh index 6338829..f1f3842 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,2 +1,7 @@ set -e -python deploy.py +export PIP_DOWNLOAD_CACHE=~/.pip_cache/ +export CI_DIST=~/clone/ci_scripts/dist +export PACKAGE_DIST=~/clone/dist +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST $PACKAGE_DIST" +pip install $PACKAGE_NAME +echo "from ci_scripts import deploy" | python diff --git a/test.sh b/test.sh index 4e99179..5d79ecf 100644 --- a/test.sh +++ b/test.sh @@ -1,5 +1,10 @@ set -e - -echo "Testing" -pip install --find-links=dist/ $PACKAGE_NAME -echo "import treeRepeat; print 'Hello World';" | python +echo "./test.sh" +export ORIGINAL_HOME=`pwd` +export ORIGINAL_PACKAGE_NAME=$PACKAGE_NAME +export PIP_DOWNLOAD_CACHE=~/.pip_cache/ +export CI_DIST=~/clone/ci_scripts/dist +export PACKAGE_DIST=~/clone/dist +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST $PACKAGE_DIST" +pip install --upgrade --find-links dist/ $PACKAGE_NAME +echo "import $PACKAGE_NAME; print 'Hello World';" | python From 39aa1f49dbf36c0e9fe7d02f54d7eeeb2d8e4749 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 18:58:48 -0500 Subject: [PATCH 11/21] Permissions --- build.sh | 0 deploy.sh | 0 test.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh mode change 100644 => 100755 deploy.sh mode change 100644 => 100755 test.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 diff --git a/test.sh b/test.sh old mode 100644 new mode 100755 From 0843d41c20e2703575d27820fe10c7f349c50708 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 19:04:42 -0500 Subject: [PATCH 12/21] Setup.py fixing --- setup.py | 47 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/setup.py b/setup.py index 98916f1..b5bdc09 100644 --- a/setup.py +++ b/setup.py @@ -1,46 +1,13 @@ -import os -from os.path import join, dirname from setuptools import setup, find_packages -def recursiveFileGenerator(rootDir): - """Recursively yield every file within the specified directory.""" - for folder, subs, files in os.walk(rootDir): - for fileName in files: - dummy,dummy,result = os.path.join(folder,fileName).partition("/") - yield result - -def makeRecursiveFileList(rootDir): - """Return a list of every file within the specified directory.""" - return list(recursiveFileGenerator(rootDir)) - -try: - f = open(join(dirname(__file__), 'README.rst')) - long_description = f.read().strip() - f.close() -except IOError: - long_description = None - setup( - name='django-angular-treeRepeat', - version='0.1', + name='django_angular_treeRepeat', + version='0.0.1', + packages=['django_angular_treeRepeat'], + include_package_data=True, zip_safe=False, - url="https://github.com/tchatel/angular-treeRepeat", - description="tchatel's angular-treeRepeat packaged in a handy django app to speed up new applications and reduce duplication.", - long_description=long_description, - author='---', - author_email='---', - keywords='django angular tree treeRepeat'.split(), platforms='any', - classifiers=[ - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'Natural Language :: English', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Topic :: Utilities', - ], - packages=['treeRepeat'], - package_dir={'treeRepeat':'.'}, - package_data={'treeRepeat':['static/treeRepeat/js/*.js',]}, + setup_requires=('ci_scripts'), + install_requires=('ci_scripts'), + package_dir={'django_angular_treeRepeat':'.'}, ) From 2486b73a5f17db0c01e1a7b34e5ac3524f9d31ed Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 19:12:05 -0500 Subject: [PATCH 13/21] Testing --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index be21cb1..fbfec69 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Recursive repeater for AngularJS ## or how to build a tree by hand + [ ![Codeship Status for CaseRails/django-angular-treeRepeat](https://www.codeship.io/projects/f88a4640-5d62-0131-692d-2a0738b6ecf1/status?branch=master)](https://www.codeship.io/projects/11978) Demo is here : http://tchatel.github.io/angular-treeRepeat/ From 3174f9f73f4a5dbb6356d8637c645d6641f96342 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 19:21:45 -0500 Subject: [PATCH 14/21] building / testing --- build.sh | 5 ++--- deploy.sh | 4 +--- test.sh | 8 ++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build.sh b/build.sh index 1b75946..06df2b4 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,6 @@ mkdir -p ~/.pip_cache export ORIGINAL_HOME=`pwd` export ORIGINAL_PACKAGE_NAME=$PACKAGE_NAME export PIP_DOWNLOAD_CACHE=~/.pip_cache/ -export CI_DIST=~/clone/ci_scripts/dist -export PACKAGE_DIST=~/clone/dist export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" pip install --upgrade pip setuptools export PIP=`which pip` @@ -16,9 +14,10 @@ cd ci_scripts ./test.sh cd $ORIGINAL_HOME export PACKAGE_NAME=$ORIGINAL_PACKAGE_NAME -export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST" $PIP install ci_scripts python setup.py clean python setup.py build python setup.py bdist_wheel python setup.py bdist_egg +cp dist/*.egg $PIP_DOWNLOAD_CACHE +cp dist/*.whl $PIP_DOWNLOAD_CACHE diff --git a/deploy.sh b/deploy.sh index f1f3842..33e0c0c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,7 +1,5 @@ set -e export PIP_DOWNLOAD_CACHE=~/.pip_cache/ -export CI_DIST=~/clone/ci_scripts/dist -export PACKAGE_DIST=~/clone/dist -export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST $PACKAGE_DIST" +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" pip install $PACKAGE_NAME echo "from ci_scripts import deploy" | python diff --git a/test.sh b/test.sh index 5d79ecf..7566eda 100755 --- a/test.sh +++ b/test.sh @@ -1,10 +1,6 @@ set -e echo "./test.sh" -export ORIGINAL_HOME=`pwd` -export ORIGINAL_PACKAGE_NAME=$PACKAGE_NAME export PIP_DOWNLOAD_CACHE=~/.pip_cache/ -export CI_DIST=~/clone/ci_scripts/dist -export PACKAGE_DIST=~/clone/dist -export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE $CI_DIST $PACKAGE_DIST" -pip install --upgrade --find-links dist/ $PACKAGE_NAME +export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" +pip install --upgrade $PACKAGE_NAME echo "import $PACKAGE_NAME; print 'Hello World';" | python From 41c0db526d2e19d60f6fd9734083c4dd321797d5 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Jan 2014 19:27:17 -0500 Subject: [PATCH 15/21] testing --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 33e0c0c..78900e7 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,5 +1,5 @@ set -e export PIP_DOWNLOAD_CACHE=~/.pip_cache/ export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" -pip install $PACKAGE_NAME +pip install --upgrade $PACKAGE_NAME echo "from ci_scripts import deploy" | python From c2f03cb99024168271dcde9142febbdb4973782f Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Fri, 17 Jan 2014 23:05:08 -0500 Subject: [PATCH 16/21] sync build scripts --- build.sh | 13 ++++++++----- test.sh | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 06df2b4..204a26e 100755 --- a/build.sh +++ b/build.sh @@ -1,13 +1,14 @@ -set -x +set -xe +# +# Build and install ci_scripts +# mkdir -p ~/.pip_cache export ORIGINAL_HOME=`pwd` export ORIGINAL_PACKAGE_NAME=$PACKAGE_NAME export PIP_DOWNLOAD_CACHE=~/.pip_cache/ export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" -pip install --upgrade pip setuptools +pip install --upgrade pip setuptools setuptools_git export PIP=`which pip` -echo "Post-Upgrade PIP Version:" -$PIP -V git clone https://github.com/CaseRails/ci_scripts.git cd ci_scripts ./build.sh @@ -15,8 +16,10 @@ cd ci_scripts cd $ORIGINAL_HOME export PACKAGE_NAME=$ORIGINAL_PACKAGE_NAME $PIP install ci_scripts +# +# End installation of ci_scripts +# python setup.py clean -python setup.py build python setup.py bdist_wheel python setup.py bdist_egg cp dist/*.egg $PIP_DOWNLOAD_CACHE diff --git a/test.sh b/test.sh index 7566eda..2e9fcc7 100755 --- a/test.sh +++ b/test.sh @@ -1,5 +1,4 @@ set -e -echo "./test.sh" export PIP_DOWNLOAD_CACHE=~/.pip_cache/ export PIP_FIND_LINKS="$PIP_DOWNLOAD_CACHE" pip install --upgrade $PACKAGE_NAME From 9c066898f1a346f4ba52da3ef305332488c0a75b Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Sat, 18 Jan 2014 12:19:16 -0500 Subject: [PATCH 17/21] testing --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..73709ba --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +Testing From 1b9e5c0242873a604bfe7719c4ea3b8fbdc44eb5 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 21 Jan 2014 14:02:31 -0500 Subject: [PATCH 18/21] Fix setup.py to include js files --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b5bdc09..aabe1dd 100644 --- a/setup.py +++ b/setup.py @@ -4,10 +4,11 @@ name='django_angular_treeRepeat', version='0.0.1', packages=['django_angular_treeRepeat'], - include_package_data=True, + package_dir={'django_angular_treeRepeat':'.'}, + package_data={'django_angular_treeRepeat':['static/treeRepeat/js/*.js',],}, zip_safe=False, platforms='any', setup_requires=('ci_scripts'), install_requires=('ci_scripts'), - package_dir={'django_angular_treeRepeat':'.'}, + ) From 4cb5a9f8eb07b8442c205d37103e3f70bce4b882 Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Wed, 22 Jan 2014 12:48:14 -0500 Subject: [PATCH 19/21] Update build script --- build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 204a26e..5b35301 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,9 @@ $PIP install ci_scripts # End installation of ci_scripts # python setup.py clean -python setup.py bdist_wheel -python setup.py bdist_egg -cp dist/*.egg $PIP_DOWNLOAD_CACHE -cp dist/*.whl $PIP_DOWNLOAD_CACHE +#python setup.py bdist_wheel +#python setup.py bdist_egg +python setup.py sdist +#cp dist/*.egg $PIP_DOWNLOAD_CACHE +#cp dist/*.whl $PIP_DOWNLOAD_CACHE +cp dist/* $PIP_DOWNLOAD_CACHE From 60db12033811dfd5dd1b9a036a6e73966cf3133a Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Wed, 22 Jan 2014 12:53:17 -0500 Subject: [PATCH 20/21] Update Manifest.in# --- MANIFEST.in | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..a93a51f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +recursive-include * * +recursive-exclude .git * +recursive-exclude wheel* * +recursive-exclude build * +recursive-exclude dist * +recursive-exclude ci_scripts * From 0402488ba3f1d74a21d9602ca4366ebcc3b38c28 Mon Sep 17 00:00:00 2001 From: Erik Dykema Date: Wed, 22 Jan 2014 14:14:55 -0500 Subject: [PATCH 21/21] Update build.sh --- PACKAGE_NAME | 1 + build.sh | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 PACKAGE_NAME diff --git a/PACKAGE_NAME b/PACKAGE_NAME new file mode 100644 index 0000000..cd0b517 --- /dev/null +++ b/PACKAGE_NAME @@ -0,0 +1 @@ +django_angular_treeRepeat \ No newline at end of file diff --git a/build.sh b/build.sh index 5b35301..f05bad4 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,13 @@ set -xe +# +# Check if PACKAGE_NAME is set, if not, load it from the file PACKAGE_NAME +# +if [ -z "$PACKAGE_NAME" ] + then + echo "Setting PACKAGE_NAME from file." + export PACKAGE_NAME=`cat PACKAGE_NAME` +fi + # # Build and install ci_scripts #