Merge pull request #552 from akhilaananthram/remove_env_var

Remove dependency on NUPIC_CORE_RELEASE environment variable

.travis.yml

@@ -57,11 +57,11 @@ before_deploy:
   - ./ci/travis/before_deploy.sh
   - cp $TRAVIS_BUILD_DIR/bindings/py/requirements.txt $TRAVIS_BUILD_DIR/bindings/py/dist/
   - mkdir -p $TRAVIS_BUILD_DIR/bindings/py/dist/include/nupic
-  - cp $NUPIC_CORE_RELEASE/include/nupic/Version.hpp $TRAVIS_BUILD_DIR/bindings/py/dist/include/nupic
+  - cp ${TRAVIS_BUILD_DIR}/build/release/include/nupic/Version.hpp $TRAVIS_BUILD_DIR/bindings/py/dist/include/nupic
   - mkdir -p $TRAVIS_BUILD_DIR/bindings/py/dist/include/nupic/proto
   - cp $TRAVIS_BUILD_DIR/src/nupic/proto/*.capnp $TRAVIS_BUILD_DIR/bindings/py/dist/include/nupic/proto
   - mkdir -p $TRAVIS_BUILD_DIR/bindings/py/dist/bin
-  - cp $NUPIC_CORE_RELEASE/bin/py_region_test $TRAVIS_BUILD_DIR/bindings/py/dist/bin
+  - cp ${TRAVIS_BUILD_DIR}/build/release/bin/py_region_test $TRAVIS_BUILD_DIR/bindings/py/dist/bin
   - mkdir -p $TRAVIS_BUILD_DIR/release
   - tar -zcvf $TRAVIS_BUILD_DIR/release/nupic_core-${TRAVIS_COMMIT}-${PLATFORM}64.tar.gz $TRAVIS_BUILD_DIR/bindings/py/dist
 
@@ -103,8 +103,7 @@ install:
   - "make -j3"
   - "make install"
   - "cd $TRAVIS_BUILD_DIR"
-  - "export NUPIC_CORE_RELEASE=\"${TRAVIS_BUILD_DIR}/build/release\""
-  - "python setup.py install --user"
+  - "python setup.py install --user --nupic-core-dir=${TRAVIS_BUILD_DIR}/build/release"
 
 script:
   - "cd $TRAVIS_BUILD_DIR/build/scripts"

appveyor.yml

@@ -116,8 +116,7 @@ build_script:
   - msbuild %MSBuildOptions% INSTALL.vcxproj
   - cd %REPO_DIR%
   - set INCLUDE='C:\Program Files (x86)\MSBuild\14.0\Include';%INCLUDE%
-  - set NUPIC_CORE_RELEASE=%REPO_DIR%\build\Release
-  - python setup.py install --user
+  - python setup.py install --user --nupic-core-dir=%REPO_DIR%\build\Release
 
 test: off
 

bindings/py/setup.py

@@ -92,9 +92,9 @@ def getCommandLineOptions():
   # optionDesc = [name, value, description]
   optionsDesc = []
   optionsDesc.append(
-    ["skip-compare-versions",
-     "",
-     "(optional) Skip nupic.core version comparison"]
+    ["nupic-core-dir",
+     "dir",
+     "Absolute path to nupic.core binary release directory"]
   )
   optionsDesc.append(
     ["optimizations-native",
@@ -529,9 +529,9 @@ def getExtensionModules(nupicCoreReleaseDir, platform, bitness, cxxCompiler, cmd
   print "NUMPY VERSION: {}".format(numpy.__version__)
 
   try:
-    nupicCoreReleaseDir = os.environ.get('NUPIC_CORE_RELEASE')
+    nupicCoreReleaseDir = getCommandLineOption("nupic-core-dir", options)
     if nupicCoreReleaseDir is None:
-      raise Exception("Must provide path to nupic core release. export NUPIC_CORE_RELEASE=<path>")
+      raise Exception("Must provide nupic core release directory. --nupic-core-dir")
     nupicCoreReleaseDir = fixPath(nupicCoreReleaseDir)
     print "Nupic Core Release Directory: {}\n".format(nupicCoreReleaseDir)
     if not os.path.isdir(nupicCoreReleaseDir):

ci/travis/after_success-release-linux.sh

@@ -36,7 +36,7 @@ pip install twine --user || exit
 echo "Creating distribution files..."
 # This release build creates the source distribution. All other release builds
 # should not.
-python setup.py sdist bdist bdist_wheel -d dist || exit
+python setup.py sdist bdist bdist_wheel --nupic-core-dir=${TRAVIS_BUILD_DIR}/build/release -d dist || exit
 
 echo "Created the following distribution files:"
 ls -l bindings/py/dist

ci/travis/after_success-release-osx.sh

@@ -38,7 +38,7 @@ export PATH=/Users/travis/Library/Python/2.7/bin:${PATH}
 echo "Creating distribution files..."
 # We are not creating sdist here, because it's being created and uploaded in the
 # linux Travis-CI release build.
-python setup.py bdist bdist_wheel -d dist || exit
+python setup.py bdist bdist_wheel --nupic-core-dir=${TRAVIS_BUILD_DIR}/build/release -d dist || exit
 
 echo "Created the following distribution files:"
 ls -l bindings/py/dist

ci/travis/before_deploy.sh

@@ -24,6 +24,8 @@ echo
 echo Running before_deploy.sh...
 echo
 
+set -o xtrace
+
 # If this branch is master, this is an iterative deployment, so we'll package
 # wheels ourselves for deployment to S3. No need to build docs.
 if [ "${TRAVIS_BRANCH}" = "master" ]; then
@@ -32,13 +34,15 @@ if [ "${TRAVIS_BRANCH}" = "master" ]; then
     pip install --upgrade pip
 
     # Assuming pip 1.5.X is installed.
-    echo "pip install wheel --user"
     pip install wheel --user
 
+    cd ${TRAVIS_BUILD_DIR}/bindings/py
+
     # Build all NuPIC and all required python packages into dist/wheels as .whl
     # files.
-    echo "pip wheel --wheel-dir=dist/wheels ."
-    pip wheel --wheel-dir=dist/wheels .
+    pip wheel --wheel-dir=dist/wheels -r requirements.txt
+    python setup.py bdist_wheel -d dist/wheels --nupic-core-dir=${TRAVIS_BUILD_DIR}/build/release
+    python setup.py bdist_egg -d dist --nupic-core-dir=${TRAVIS_BUILD_DIR}/build/release
     # The dist/wheels folder is expected to be deployed to S3.
 
 # If this is a tag, we're doing a release deployment, so we want to build docs