kdm9
commented
9 years ago Tim,
In the interim, git stash should clear uncommited changes.
K
On Tue, 18 Nov 2014 15:07:03 -0800 Tim Brown notifications@github.com wrote:
Hi JOel, Not sure if this is important but the derandomizer throws a few errors when loading...
Already on 'next' Your branch is ahead of 'origin/next' by 6 commits. (use "git push" to publish your local commits) remote: Counting objects: 447, done. remote: Compressing objects: 100% (198/198), done. emote: Total 447 (delta 241), reused 418 (delta 232)R Receiving objects: 100% (447/447), 128.03 KiB | 120.00 KiB/s, done.
Resolving deltas: 100% (241/241), done. From https://github.com/Joelgranados/timestreamlib
- f278d2e...ed00285 next -> origin/next (forced update) Auto-merging util/derandui.py Auto-merging timestream/parse/init.py CONFLICT (content): Merge conflict in timestream/parse/init.py Auto-merging timestream/manipulate/pipecomponents.py CONFLICT (content): Merge conflict in timestream/manipulate/pipecomponents.py Auto-merging timestream/manipulate/init.py Auto-merging scripts/run-pipeline.py Automatic merge failed; fix conflicts and then commit the result. running install running bdist_egg running egg_info writing requirements to timestream.egg-info\requires.txt writing timestream.egg-info\PKG-INFO writing top-level names to timestream.egg-info\top_level.txt writing dependency_links to timestream.egg-info\dependency_links.txt reading manifest file 'timestream.egg-info\SOURCES.txt' reading manifest template 'MANIFEST.in' writing manifest file 'timestream.egg-info\SOURCES.txt' installing library code to build\bdist.win-amd64\egg running install_lib running build_py copying timestream\manipulate\configuration.py -> build\lib\timestream\manipulat e copying timestream\manipulate\pipecomponents.py -> build\lib\timestream\manipula te copying timestream\manipulate\pipeline.py -> build\lib\timestream\manipulate copying timestream\manipulateinit.py -> build\lib\timestream\manipulate copying timestream\parseinit.py -> build\lib\timestream\parse creating build\bdist.win-amd64\egg creating build\bdist.win-amd64\egg\timestream creating build\bdist.win-amd64\egg\timestream\manipulate copying build\lib\timestream\manipulate\configuration.py -> build\bdist.win-amd6 4\egg\timestream\manipulate copying build\lib\timestream\manipulate\correct_detect.py -> build\bdist.win-amd 64\egg\timestream\manipulate copying build\lib\timestream\manipulate\pipecomponents.py -> build\bdist.win-amd 64\egg\timestream\manipulate copying build\lib\timestream\manipulate\pipeline.py -> build\bdist.win-amd64\egg \timestream\manipulate copying build\lib\timestream\manipulate\plantSegmenter.py -> build\bdist.win-amd 64\egg\timestream\manipulate copying build\lib\timestream\manipulate\pot.py -> build\bdist.win-amd64\egg\time stream\manipulate copying build\lib\timestream\manipulateinit.py -> build\bdist.win-amd64\egg \timestream\manipulate creating build\bdist.win-amd64\egg\timestream\parse copying build\lib\timestream\parse\validate.py -> build\bdist.win-amd64\egg\time stream\parse copying build\lib\timestream\parseinit.py -> build\bdist.win-amd64\egg\time stream\parse creating build\bdist.win-amd64\egg\timestream\util copying build\lib\timestream\util\imgmeta.py -> build\bdist.win-amd64\egg\timest ream\util copying build\lib\timestream\util\layouts.py -> build\bdist.win-amd64\egg\timest ream\util copying build\lib\timestream\util\validation.py -> build\bdist.win-amd64\egg\tim estream\util copying build\lib\timestream\utilinit.py -> build\bdist.win-amd64\egg\times tream\util copying build\lib\timestream_version.py -> build\bdist.win-amd64\egg\timestream
copying build\lib\timestreaminit.py -> build\bdist.win-amd64\egg\timestream
byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\configuration.py to configuration.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\correct_detect.py to correct_detect.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pipecomponents.py to pipecomponents.pyc File "build\bdist.win-amd64\egg\timestream\manipulate\pipecomponents.py", line 180 <<<<<<< HEAD ^ SyntaxError: invalid syntax
byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pipeline.py to pi peline.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\plantSegmenter.py to plantSegmenter.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pot.py to pot.pyc
byte-compiling build\bdist.win-amd64\egg\timestream\manipulateinit.py to init.pyc byte-compiling build\bdist.win-amd64\egg\timestream\parse\validate.py to validat e.pyc byte-compiling build\bdist.win-amd64\egg\timestream\parseinit.py to init .pyc Sorry: IndentationError: expected an indented block (__init.py, line 354) byte-compiling build\bdist.win-amd64\egg\timestream\util\imgmeta.py to imgmeta.p yc byte-compiling build\bdist.win-amd64\egg\timestream\util\layouts.py to layouts.p yc byte-compiling build\bdist.win-amd64\egg\timestream\util\validation.py to valida tion.pyc byte-compiling build\bdist.win-amd64\egg\timestream\utilinit.py to init .pyc byte-compiling build\bdist.win-amd64\egg\timestream_version.py to _version.pyc byte-compiling build\bdist.win-amd64\egg\timestreaminit.py to init.pyc creating build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\PKG-INFO -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\SOURCES.txt -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\dependency_links.txt -> build\bdist.win-amd64\egg\EG G-INFO copying timestream.egg-info\requires.txt -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\top_level.txt -> build\bdist.win-amd64\egg\EGG-INFO zip_safe flag not set; analyzing archive contents... timestream._version: module references file creating 'dist\timestream-4c32fff_dirty-py2.7.egg' and adding 'build\bdist.win-a md64\egg' to it removing 'build\bdist.win-amd64\egg' (and everything under it) Processing timestream-4c32fff_dirty-py2.7.egg creating c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-package s\timestream-4c32fff_dirty-py2.7.egg Extracting timestream-4c32fff_dirty-py2.7.egg to c:\users\phenocam admin\desktop \virtenvs\timestreamlib\lib\site-packages File "c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages \timestream-4c32fff_dirty-py2.7.egg\timestream\manipulate\pipecomponents.py", li ne 180 <<<<<<< HEAD ^ SyntaxError: invalid syntax
Sorry: IndentationError: expected an indented block (init.py, line 354) Removing timestream 4c32fff from easy-install.pth file Adding timestream 4c32fff-dirty to easy-install.pth file
Installed c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packag es\timestream-4c32fff_dirty-py2.7.egg Processing dependencies for timestream==4c32fff-dirty Searching for scikit-image==0.10.1 Best match: scikit-image 0.10.1 Adding scikit-image 0.10.1 to easy-install.pth file Installing skivi-script.py script to C:\Users\Phenocam Admin\Desktop\virtenvs\ti mestreamlib\Scripts Installing skivi.exe script to C:\Users\Phenocam Admin\Desktop\virtenvs\timestre amlib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages Searching for voluptuous==0.8.4 Best match: voluptuous 0.8.4 Processing voluptuous-0.8.4-py2.7.egg voluptuous 0.8.4 is already the active version in easy-install.pth
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\v oluptuous-0.8.4-py2.7.egg Searching for docopt==0.6.2 Best match: docopt 0.6.2 Processing docopt-0.6.2-py2.7.egg docopt 0.6.2 is already the active version in easy-install.pth
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\d ocopt-0.6.2-py2.7.egg Searching for exifread==1.4.2 Best match: exifread 1.4.2 Processing exifread-1.4.2-py2.7.egg exifread 1.4.2 is already the active version in easy-install.pth Installing EXIF.py script to C:\Users\Phenocam Admin\Desktop\virtenvs\timestream lib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\e xifread-1.4.2-py2.7.egg Searching for setuptools==3.6 Best match: setuptools 3.6 Adding setuptools 3.6 to easy-install.pth file Installing easy_install-3.4-script.py script to C:\Users\Phenocam Admin\Desktop\ virtenvs\timestreamlib\Scripts Installing easy_install-3.4.exe script to C:\Users\Phenocam Admin\Desktop\virten vs\timestreamlib\Scripts Installing easy_install-script.py script to C:\Users\Phenocam Admin\Desktop\virt envs\timestreamlib\Scripts Installing easy_install.exe script to C:\Users\Phenocam Admin\Desktop\virtenvs\t imestreamlib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages Finished processing dependencies for timestream==4c32fff-dirty writing list of installed files to 'files.txt'
Reply to this email directly or view it on GitHub: https://github.com/borevitzlab/timestreamlib/issues/134
Joelgranados
Hi JOel, Not sure if this is important but the derandomizer throws a few errors when loading...
Already on 'next' Your branch is ahead of 'origin/next' by 6 commits. (use "git push" to publish your local commits) remote: Counting objects: 447, done. remote: Compressing objects: 100% (198/198), done. emote: Total 447 (delta 241), reused 418 (delta 232)R Receiving objects: 100% (447/447), 128.03 KiB | 120.00 KiB/s, done.
Resolving deltas: 100% (241/241), done. From https://github.com/Joelgranados/timestreamlib
copying build\lib\timestreaminit.py -> build\bdist.win-amd64\egg\timestream
byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\configuration.py to configuration.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\correct_detect.py to correct_detect.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pipecomponents.py to pipecomponents.pyc File "build\bdist.win-amd64\egg\timestream\manipulate\pipecomponents.py", line 180 <<<<<<< HEAD ^ SyntaxError: invalid syntax
byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pipeline.py to pi peline.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\plantSegmenter.py to plantSegmenter.pyc byte-compiling build\bdist.win-amd64\egg\timestream\manipulate\pot.py to pot.pyc
byte-compiling build\bdist.win-amd64\egg\timestream\manipulateinit.py to init.pyc byte-compiling build\bdist.win-amd64\egg\timestream\parse\validate.py to validat e.pyc byte-compiling build\bdist.win-amd64\egg\timestream\parseinit.py to init .pyc Sorry: IndentationError: expected an indented block (__init.py, line 354) byte-compiling build\bdist.win-amd64\egg\timestream\util\imgmeta.py to imgmeta.p yc byte-compiling build\bdist.win-amd64\egg\timestream\util\layouts.py to layouts.p yc byte-compiling build\bdist.win-amd64\egg\timestream\util\validation.py to valida tion.pyc byte-compiling build\bdist.win-amd64\egg\timestream\utilinit.py to init .pyc byte-compiling build\bdist.win-amd64\egg\timestream_version.py to _version.pyc byte-compiling build\bdist.win-amd64\egg\timestreaminit.py to init.pyc creating build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\PKG-INFO -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\SOURCES.txt -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\dependency_links.txt -> build\bdist.win-amd64\egg\EG G-INFO copying timestream.egg-info\requires.txt -> build\bdist.win-amd64\egg\EGG-INFO copying timestream.egg-info\top_level.txt -> build\bdist.win-amd64\egg\EGG-INFO zip_safe flag not set; analyzing archive contents... timestream._version: module references file creating 'dist\timestream-4c32fff_dirty-py2.7.egg' and adding 'build\bdist.win-a md64\egg' to it removing 'build\bdist.win-amd64\egg' (and everything under it) Processing timestream-4c32fff_dirty-py2.7.egg creating c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-package s\timestream-4c32fff_dirty-py2.7.egg Extracting timestream-4c32fff_dirty-py2.7.egg to c:\users\phenocam admin\desktop \virtenvs\timestreamlib\lib\site-packages File "c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages \timestream-4c32fff_dirty-py2.7.egg\timestream\manipulate\pipecomponents.py", li ne 180 <<<<<<< HEAD ^ SyntaxError: invalid syntax
Sorry: IndentationError: expected an indented block (init.py, line 354) Removing timestream 4c32fff from easy-install.pth file Adding timestream 4c32fff-dirty to easy-install.pth file
Installed c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packag es\timestream-4c32fff_dirty-py2.7.egg Processing dependencies for timestream==4c32fff-dirty Searching for scikit-image==0.10.1 Best match: scikit-image 0.10.1 Adding scikit-image 0.10.1 to easy-install.pth file Installing skivi-script.py script to C:\Users\Phenocam Admin\Desktop\virtenvs\ti mestreamlib\Scripts Installing skivi.exe script to C:\Users\Phenocam Admin\Desktop\virtenvs\timestre amlib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages Searching for voluptuous==0.8.4 Best match: voluptuous 0.8.4 Processing voluptuous-0.8.4-py2.7.egg voluptuous 0.8.4 is already the active version in easy-install.pth
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\v oluptuous-0.8.4-py2.7.egg Searching for docopt==0.6.2 Best match: docopt 0.6.2 Processing docopt-0.6.2-py2.7.egg docopt 0.6.2 is already the active version in easy-install.pth
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\d ocopt-0.6.2-py2.7.egg Searching for exifread==1.4.2 Best match: exifread 1.4.2 Processing exifread-1.4.2-py2.7.egg exifread 1.4.2 is already the active version in easy-install.pth Installing EXIF.py script to C:\Users\Phenocam Admin\Desktop\virtenvs\timestream lib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages\e xifread-1.4.2-py2.7.egg Searching for setuptools==3.6 Best match: setuptools 3.6 Adding setuptools 3.6 to easy-install.pth file Installing easy_install-3.4-script.py script to C:\Users\Phenocam Admin\Desktop\ virtenvs\timestreamlib\Scripts Installing easy_install-3.4.exe script to C:\Users\Phenocam Admin\Desktop\virten vs\timestreamlib\Scripts Installing easy_install-script.py script to C:\Users\Phenocam Admin\Desktop\virt envs\timestreamlib\Scripts Installing easy_install.exe script to C:\Users\Phenocam Admin\Desktop\virtenvs\t imestreamlib\Scripts
Using c:\users\phenocam admin\desktop\virtenvs\timestreamlib\lib\site-packages Finished processing dependencies for timestream==4c32fff-dirty writing list of installed files to 'files.txt'