Merge pull request #42 from UDST/patch

[v1.5.2] Maintenance release

.travis.yml

@@ -1,34 +1,29 @@
 language: python
-sudo: false
+
 python:
-- '2.7'
-- '3.5'
-before_install:
-- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
-  -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; fi
-- bash miniconda.sh -b -p $HOME/miniconda
-- export PATH="$HOME/miniconda/bin:$PATH"
-- hash -r
-- conda config --set always_yes yes --set changeps1 no
-- conda update -q conda
-- conda info -a
-- |
-  conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION cytoolz flask pandas pip pygments pytables pytest six
-- source activate test-environment
-- pip install pytest-cov coveralls pycodestyle
-- bin/build_js_bundle.sh complete
+  - '2.7'
+  - '3.5'
+  - '3.6'
+  - '3.7'
+  # - '3.8' broken because PyTables binaries aren't available yet
+
 install:
-- pip install .
+  - pip install .
+  - pip install pytest-cov coveralls pycodestyle
+  - pip install flask pygments  # for server component tests
+  - bin/build_js_bundle.sh complete
+  - pip install numpydoc sphinx sphinx_rtd_theme  # for building docs 
+  - pip list
+  - pip show orca
+
 script:
-- pycodestyle orca
-- py.test --cov orca --cov-report term-missing
+  - pycodestyle orca
+  - py.test --cov orca --cov-report term-missing
+
 after_success:
-- coveralls
-- bin/build_docs.sh
-notifications:
-  slack:
-    secure: c4s/7CYpc0qaPdjEUXrX3b04gKfbpHcGz3JV8wEGOZAIvBSILGQTsQ/JD9i8b8r/MKH7Ofj8ZEvgi7TZoa40rv6GFo3beUJezeHd98B5JIVa3mKIvtzZ9BJZFpIs/tUobsuZpOH3eHh/D1HaX3mcg87ys0qB7UeIiEJqltrUMv0=
+  - coveralls
+  - bin/build_docs.sh
+
 env:
   global:
     secure: DMQgAnged8quDKf3pTLG6RZVMKhrhZfYSRKaPFJrERXEOuRPJjC4QYG24pdyCV2aOQbSOiF16vSctpDmMfjLDARkhNm8FvYYCOKLkE+4ijQ4vE/uQaHsnosGS/1LOOFGjK0h2dvm4CNJqV1JUhCKeOVe/87GGY2JVBy+NJnsl70=

HISTORY.rst

@@ -1,3 +1,8 @@
+v1.5.2
+======
+
+* Updated requirements to streamline installation.
+
 v1.5.1
 ======
 

LICENSE → LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016, UrbanSim Inc. All rights reserved.
+Copyright (c) 2019, UrbanSim Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.rst

@@ -5,10 +5,6 @@ Orca
     :target: https://pypi.python.org/pypi/orca/
     :alt: PyPI Latest Version
 
-.. image:: https://img.shields.io/pypi/pyversions/orca.svg
-    :target: https://pypi.python.org/pypi/orca/
-    :alt: Supported Python versions
-
 .. image:: https://travis-ci.org/UDST/orca.svg?branch=master
     :target: https://travis-ci.org/UDST/orca
     :alt: Build Status

bin/build_docs.sh

@@ -33,10 +33,6 @@ if [ "$TRAVIS_REPO_SLUG" == "UDST/orca" ] && \
         [ "$TRAVIS_PULL_REQUEST" == "false" ] && \
         [ "$ACTUAL_TRAVIS_JOB_NUMBER" == "1" ]; then
 
-        echo "Installing dependencies"
-        conda install --yes --quiet sphinx numpydoc
-        pip install sphinx_rtd_theme
-
         echo "Building docs"
         cd docs
         make clean

docs/conf.py

@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = 'Orca'
-copyright = '2017, UrbanSim Inc'
+copyright = '2019, UrbanSim Inc'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.1'
+release = '1.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.