Version 0.9.4

.travis.yml

@@ -22,8 +22,6 @@ python:
 env:
   # - JNAME="2.6"
   # - JNAME="2.7"
-
-
 
 before_install:
   - env
@@ -112,12 +110,6 @@ before_install:
   - if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ ! -f /usr/include/ft2build.h ]; then
         sudo ln -s /usr/include/freetype2/ft2build.h /usr/include/.;
     fi
-  - if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
-       echo "Creating Dropbox configuration";
-       openssl aes-256-cbc -K $encrypted_28396a62e614_key -iv $encrypted_28396a62e614_iv -in .dropbox_uploader.enc -out ~/.dropbox_uploader -d;
-    else
-       echo "Dropbox configuration could not be created";
-    fi
 
 install:
   ###
@@ -224,17 +216,19 @@ notifications:
     on_failure: always
 
 after_success:
-  - cd ${REPO_DIR}
-  - cp ${RESULTS_DIR}/codecoverage/coverage.xml ${REPO_DIR}/.
-  - export DOT_SOURCE_DIR=${SOURCE_DIR//\//.}
-  - export DOT_REPO_DIR=${REPO_DIR//\//.}
-  - sed -r -i -e "s|${SOURCE_DIR}|${REPO_DIR}/${PKG_NAME}|g" coverage.xml
-  - sed -r -i -e "s|${DOT_SOURCE_DIR}|${DOT_REPO_DIR}.${PKG_NAME}|g" coverage.xml
-  - codecov --token=${CODECOV_TOKEN} --file=${REPO_DIR}/coverage.xml
+  - if [ "${CODECOV_TOKEN}" != "" ]; then
+        cd ${REPO_DIR};
+        cp ${RESULTS_DIR}/codecoverage/coverage.xml ${REPO_DIR}/.;
+        export DOT_SOURCE_DIR=${SOURCE_DIR//\//.};
+        export DOT_REPO_DIR=${REPO_DIR//\//.};
+        sed -r -i -e "s|${SOURCE_DIR}|${REPO_DIR}/${PKG_NAME}|g" coverage.xml;
+        sed -r -i -e "s|${DOT_SOURCE_DIR}|${DOT_REPO_DIR}.${PKG_NAME}|g" coverage.xml;
+        codecov --token=${CODECOV_TOKEN} --file=${REPO_DIR}/coverage.xml;
+    fi
 
 after_failure:
   - ${EXTRA_DIR}/sbin/zip-artifacts.sh ${INTERP}
-  - if [ -f ~/.dropbox_uploader ] && [ -f ${AFILE} ]; then
+  - if [ -f "${AFILE}" ]; then
         ${REPO_DIR}/sbin/dropbox_uploader.sh upload ${AFILE} .;
     else
         echo "Artifacts could not be exported";

CHANGELOG.rst

@@ -5,8 +5,10 @@
 Changelog
 =========
 
+* 0.9.4 [2015-12-18]: Minor documentation update regarding continuous
+  integration setup
 * 0.9.3 [2015-12-17]: Fixed critical bug in plot module that prevented figures
-                      without any axis labels from being generated
+  without any axis labels from being generated
 * 0.9.2 [2015-12-15]: Speed improvements in plot module
 * 0.9.1 [2015-12-01]: Final release of 0.9.1 branch
 * 0.9.1rc5 [2015-12-01]: Fixed documentation URL in top-level README.rst

README.rst

@@ -329,7 +329,21 @@ Contributing
    integration configured for Linux (via `Travis <http://www.travis-ci.org>`_)
    and for Microsoft Windows (via `Appveyor <http://www.appveyor.com>`_).
    Aggregation/cloud code coverage is configured via
-   `Codecov <https://codecov.io>`_
+   `Codecov <https://codecov.io>`_. It is assumed that the Codecov repository
+   upload token in the Travis build is stored in the :bash:`${CODECOV_TOKEN}`
+   environment variable (securely defined in the Travis repository settings
+   page). Travis build artifacts can be transferred to Dropbox using the
+   `Dropbox Uploader <https://github.com/andreafabrizi/Dropbox-Uploader>`_
+   script (included for convenience in the :bash:`${PUTIL_DIR}/sbin` directory).
+   For an automatic transfer that does not require manual entering of
+   authentication credentials place the APPKEY, APPSECRET, ACCESS_LEVEL,
+   OAUTH_ACCESS_TOKEN and OAUTH_ACCESS_TOKEN_SECRET values required by
+   Dropbox Uploader in the in the :bash:`${DBU_APPKEY}`,
+   :bash:`${DBU_APPSECRET}`, :bash:`${DBU_ACCESS_LEVEL}`,
+   :bash:`${DBU_OAUTH_ACCESS_TOKEN}` and
+   :bash:`${DBU_OAUTH_ACCESS_TOKEN_SECRET}` environment variables,
+   respectively (also securely defined in Travis repository settings page)
+
 
 9. Document the new feature or bug fix (if needed). The script
    :bash:`${PUTIL_DIR}/sbin/build_docs.py` re-builds the whole package

data/aspell-whitelist

@@ -18,6 +18,8 @@ aobj
 api
 API
 appdata
+APPKEY
+APPSECRET
 appveyor
 Appveyor
 arg
@@ -122,6 +124,7 @@ CNAME
 cnode
 cobj
 Codecov
+CODECOV
 codecoverage
 codelog
 cogapp
@@ -193,6 +196,7 @@ darkturquoise
 darkviolet
 DataSource
 datetime
+DBU
 ddir
 dec
 decfunc
@@ -239,6 +243,7 @@ dodgerblue
 dpk
 drawstyle
 dropbox
+Dropbox
 ds
 dsort
 dst
@@ -664,6 +669,7 @@ nums
 nuniq
 nvar
 nzero
+OAUTH
 ocols
 oct
 odata
@@ -1054,6 +1060,7 @@ unittest
 unsupp
 uobj
 uploader
+Uploader
 uret
 url
 urows

docs/README.rst

@@ -329,7 +329,21 @@ Contributing
    integration configured for Linux (via `Travis <http://www.travis-ci.org>`_)
    and for Microsoft Windows (via `Appveyor <http://www.appveyor.com>`_).
    Aggregation/cloud code coverage is configured via
-   `Codecov <https://codecov.io>`_
+   `Codecov <https://codecov.io>`_. It is assumed that the Codecov repository
+   upload token in the Travis build is stored in the :bash:`${CODECOV_TOKEN}`
+   environment variable (securely defined in the Travis repository settings
+   page). Travis build artifacts can be transferred to Dropbox using the
+   `Dropbox Uploader <https://github.com/andreafabrizi/Dropbox-Uploader>`_
+   script (included for convenience in the :bash:`${PUTIL_DIR}/sbin` directory).
+   For an automatic transfer that does not require manual entering of
+   authentication credentials place the APPKEY, APPSECRET, ACCESS_LEVEL,
+   OAUTH_ACCESS_TOKEN and OAUTH_ACCESS_TOKEN_SECRET values required by
+   Dropbox Uploader in the in the :bash:`${DBU_APPKEY}`,
+   :bash:`${DBU_APPSECRET}`, :bash:`${DBU_ACCESS_LEVEL}`,
+   :bash:`${DBU_OAUTH_ACCESS_TOKEN}` and
+   :bash:`${DBU_OAUTH_ACCESS_TOKEN_SECRET}` environment variables,
+   respectively (also securely defined in Travis repository settings page)
+
 
 9. Document the new feature or bug fix (if needed). The script
    :bash:`${PUTIL_DIR}/sbin/build_docs.py` re-builds the whole package

docs/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.3'
+version = '0.9.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.3'
+release = '0.9.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

putil/version.py

@@ -10,7 +10,7 @@
 ###
 # Global variables
 ###
-VERSION_INFO = (0, 9, 3, 'final', 0)
+VERSION_INFO = (0, 9, 4, 'final', 0)
 
 ###
 # Functions

sbin/build_wheel_cache.py

@@ -83,20 +83,7 @@ def build_wheel_cache():
         if not pipcmd:
             print('pip {0} not found'.format(pyver))
             continue
-        interp_path = os.path.dirname(os.path.dirname(pycmd))
-        os.environ['PYTHONPATH'] = (
-            os.path.join(
-                interp_path, 'lib', 'python{0}'.format(pyver)
-            )
-            +
-            ':'+old_python_path
-        )
-        print(
-            _pcolor(
-                'PYTHONPATH set to {0}'.format(os.environ['PYTHONPATH']),
-                'cyan'
-            )
-        )
+        os.environ['PYTHONPATH'] = ''
         lines = load_requirements(pkg_dir, pyver)
         for line in lines:
             if 'numpy' in line:

sbin/dropbox_uploader.sh

@@ -1113,8 +1113,22 @@ function db_share
 #### SETUP  ####
 ################
 
+#CHECKING FOR ENVIRONMENT VARIABLES
+if [ "${DBU_APPKEY}" != "" ] && [ "${DBU_APPSECRET}" != "" ] && [ "${DBU_OAUTH_ACCESS_TOKEN_SECRET}" != "" ] && [ "${DBU_OAUTH_ACCESS_TOKEN}" != "" ]; then
+
+    APPKEY="${DBU_APPKEY}"
+	APPSECRET="${DBU_APPSECRET}"
+    ACCESS_LEVEL="${DBU_ACCESS_LEVEL}"
+	OAUTH_ACCESS_TOKEN_SECRET="${DBU_OAUTH_ACCESS_TOKEN_SECRET}"
+	OAUTH_ACCESS_TOKEN="${DBU_OAUTH_ACCESS_TOKEN}"
+
+    #Back compatibility with previous Dropbox Uploader versions
+    if [[ $ACCESS_LEVEL == "" ]]; then
+        ACCESS_LEVEL="dropbox"
+    fi
+
 #CHECKING FOR AUTH FILE
-if [[ -e $CONFIG_FILE ]]; then
+elif [[ -e $CONFIG_FILE ]]; then
 
     #Loading data... and change old format config if necesary.
     source "$CONFIG_FILE" 2>/dev/null || {