From 8e465b149c456ffb9a4f3a237dfc2104c8b6414b Mon Sep 17 00:00:00 2001 From: Scott Purdy Date: Tue, 21 Mar 2017 15:43:21 -0700 Subject: [PATCH] Remove PYPI deployment from Travis configuration --- .travis.yml | 11 ----- CMakeLists.txt | 11 ----- appveyor.yml | 2 - ci/travis/after_success-release-osx.sh | 56 -------------------------- 4 files changed, 80 deletions(-) delete mode 100755 ci/travis/after_success-release-osx.sh diff --git a/.travis.yml b/.travis.yml index 37ae4709..87e0bc4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,6 @@ env: - AWS_ACCESS_KEY_ID=AKIAIGHYSEHV3WFKOWNQ # AWS_SECRET_ACCESS_KEY encrypted below - secure: "Ixm9TYZAZbCQicUTIZTY7XKNK82WF+f1jsaGtIxnGQmn0LKhKBjQnsZmhzQ7LDQeLUjRY3wM6xrX3YdP5T7WWiiqBiNCRz8oFxl/fBSm7LyuNo2CEGD9rsG6ZAY/sKKYNX5TuG78giJXwYZpq4LbVwy3W5ZlC626H7iXLQ6xDxw=" - # PyPi credentials for manual uploads to Pypi on release. - - PYPI_USERNAME=numenta - # PYPI_PASSWD encrypted below. - - secure: "oFaHJoYEq/w13o3MANKGeM/qKYhy3A8Mu2HdxhBCbRXgOhzNDLtujFKUoERmAmWLW8ARHexZWHa+0SS378+Gqgv0fgG8C7RMToBXgLWFXrv6ih0H5aFn4P2v1pYttEk1Gp+HFKFrbbmhHvDOiM+i6t78gIrt3w+raXzONgRbj2I=" - - NUPIC_DEPLOYMENT_BUILD=true virtualenv: system_site_packages: true @@ -110,9 +105,3 @@ script: - "cd $TRAVIS_BUILD_DIR/build/artifacts/" # transform the JUnit-style xml report to html - "xsltproc $TRAVIS_BUILD_DIR/docs/xunit.xslt unit_tests_report.xml > unit_tests_report.html" - -after_success: - - "cd $TRAVIS_BUILD_DIR" - # # Send test coverage report to http://coveralls.io under only linux - # - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then coveralls --gcov /usr/bin/gcov-4.8 --exclude external --exclude doc --exclude src/test > /dev/null 2>/dev/stdout|grep -v 'gcno:version'|grep -v 'gcda:version'; fi" - - "if [ -n \"${TRAVIS_TAG}\" -a \"${TRAVIS_OS_NAME}--${CC}\" = 'osx--clang' ]; then . ./ci/travis/after_success-release-osx.sh; fi" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cf0c2c0..3bfbd6bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,17 +53,6 @@ option(NUPIC_BUILD_PYEXT_MODULES message(STATUS "NUPIC_BUILD_PYEXT_MODULES = ${NUPIC_BUILD_PYEXT_MODULES}") message(STATUS "PY_EXTENSIONS_DIR = ${PY_EXTENSIONS_DIR}") -# -# Identify build type - local or deployment (Travis) -# the variable NUPIC_DEPLOYMENT_BUILD must be set in travis CI scripts -# -if($ENV{NUPIC_DEPLOYMENT_BUILD}) - message("Doing a deployment build in TravisCI") -else() - message("Doing a local build") -endif() - - message(STATUS "CMAKE_CXX_COMPILER_ID = ${CMAKE_CXX_COMPILER_ID}") message(STATUS "CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}") message(STATUS "CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}") diff --git a/appveyor.yml b/appveyor.yml index e764e913..1c92bf28 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,8 +82,6 @@ configuration: Release install: - - set NUPIC_DEPLOYMENT_BUILD=1 - # Dump appveyor build vars for diagnostics - "ECHO APPVEYOR_FORCED_BUILD: %APPVEYOR_FORCED_BUILD%" - "ECHO APPVEYOR_RE_BUILD: %APPVEYOR_RE_BUILD%" diff --git a/ci/travis/after_success-release-osx.sh b/ci/travis/after_success-release-osx.sh deleted file mode 100755 index 842b3f90..00000000 --- a/ci/travis/after_success-release-osx.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Numenta Platform for Intelligent Computing (NuPIC) -# Copyright (C) 2013-5, Numenta, Inc. Unless you have an agreement -# with Numenta, Inc., for a separate license for this software code, the -# following terms and conditions apply: -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero Public License version 3 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU Affero Public License for more details. -# -# You should have received a copy of the GNU Affero Public License -# along with this program. If not, see http://www.gnu.org/licenses. -# -# http://numenta.org/licenses/ -# ---------------------------------------------------------------------- - -echo -echo "Running after_success-release.sh..." -echo - -cd ${TRAVIS_BUILD_DIR} - -echo "Installing wheel..." -pip install wheel==0.25.0 --user || exit -echo "Installing twine..." -pip install twine --user -v || exit - -# Twine gets installed into /Users/travis/Library/Python/2.7/bin, which needs to -# be added to the PATH -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 - -echo "Created the following distribution files:" -ls -l bindings/py/dist -# These should get created on osx: -# nupic-0.0.33-cp27-none-macosx_10_9_intel.whl -# nupic-0.0.33-py2.7-macosx-10.9-intel.egg -# nupic-0.0.33.macosx-10.9-intel.tar.gz - -echo "Uploading OS X egg to PyPi..." -twine upload bindings/py/dist/nupic.bindings-*.egg -u "${PYPI_USERNAME}" -p "${PYPI_PASSWD}" -echo "Uploading OS x wheel to PyPi..." -twine upload bindings/py/dist/nupic.bindings-*.whl -u "${PYPI_USERNAME}" -p "${PYPI_PASSWD}" - -echo "Attempting to upload all distribution files to PyPi..." -twine upload bindings/py/dist/* -u "${PYPI_USERNAME}" -p "${PYPI_PASSWD}"