0.0.34 2015-05-14 ::

Code cleanup.

.gitignore

@@ -3,6 +3,7 @@
 #############
 
 *.py[co]
+*.json
 *.pkl
 *.~*
 

.travis.yml

@@ -2,9 +2,15 @@ language: python
 python:
   - "2.7"
   - "3.4"
-install: pip install --use-mirrors -r requirements.txt
-script:
-  py.test --cov daysgrounded test/
+  - "pypy"
+  - "pypy3"
+before_install: pip install pytest-cov
+install:
+  - "pip install -r requirements.txt"
+  #- "if [[ $TRAVIS_PYTHON_VERSION != pypy && $TRAVIS_PYTHON_VERSION != pypy3 ]]; then pip install -r requirements.txt ; fi"
+  #- "if [ $TRAVIS_PYTHON_VERSION = pypy ]; then pip install git+https://bitbucket.org/pypy/numpy.git ; fi"
+  #- "if [ $TRAVIS_PYTHON_VERSION = pypy3 ]; then pip install git+https://bitbucket.org/pypy/numpy.git ; fi"
+script: py.test --cov-report term-missing --cov daysgrounded -v test
 notifications:
   email:
     on_success: always

ChangeLog.rst

@@ -1,3 +1,8 @@
+0.0.34 2015-05-14 ::
+
+	Code cleanup.
+
+
 0.0.33 2015-05-02 ::
 
 	Update .gitignore.

README.rst

@@ -58,15 +58,20 @@ Resources and contributing
 
 **Resources**
 
-* `Repository <https://github.com/jcrmatos/daysgrounded>`_
+* `Repository PyPI <https://pypi.python.org/pypi/daysgrounded>`_
+* `Documentation PyPI <http://pythonhosted.org/daysgrounded>`_
+* `Repository Github <https://github.com/jcrmatos/daysgrounded>`_
+* `Documentation Read the Docs <http://daysgrounded.readthedocs.org>`_
 
 **Contributing**
 
-1. Fork the `repository`_ on GitHub.
+If Other repository above is Github or compatible, follow these guidelines for contributing:
+
+1. Fork the `repository`_ .
 2. Make a branch of master and commit your changes to it.
 3. Ensure that your name is added to the end of the AUTHORS.rst file using the format:
    ``Name <email@domain.com>``
-4. Submit a Pull Request to the master branch on GitHub.
+4. Submit a Pull Request to the master branch.
 
 .. _repository: https://github.com/jcrmatos/daysgrounded
 

appinfo.py

@@ -19,20 +19,17 @@
 """Application basic information."""
 
 # Python 3 compatibility
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-# sometimes py2exe requires the following import to be commented
-# from __future__ import unicode_literals
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-# import builtins  # Python 3 compatibility
 import datetime as dt
-# import future  # Python 3 compatibility
 # import io  # Python 3 compatibility
 
+# from builtins import input  # Python 3 compatibility
+
 
 APP_NAME = 'daysgrounded'
-APP_VERSION = '0.0.33'
+APP_VERSION = '0.0.34'
 APP_LICENSE = 'GNU General Public License v2 or later (GPLv2+)'
 APP_AUTHOR = 'Joao Carlos Roseta Matos'
 APP_EMAIL = 'jcrmatos@gmail.com'

appveyor.yml

@@ -0,0 +1,65 @@
+environment:
+
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_compiler.cmd"
+
+  matrix:
+    - PYTHON: "C:\\Python27"
+      PYTHON_VERSION: "2.7.9"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.3"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_VERSION: "2.7.9"
+      PYTHON_ARCH: "64"
+      WINDOWS_SDK_VERSION: "v7.0"
+
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.3"
+      PYTHON_ARCH: "64"
+      WINDOWS_SDK_VERSION: "v7.1"
+
+init:
+  - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
+
+install:
+  - "powershell appveyor\\install.ps1"
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "pip install twine pytest pytest-cov Sphinx"
+  - "pip install -r requirements.txt"
+
+# It's off because it doesn't apply to Python
+build: off
+
+test_script:
+  #- "%WITH_COMPILER% %PYTHON%/python setup.py test"
+  #- "%WITH_COMPILER% %PYTHON%/python py.test --cov daysgrounded -v test"
+  - "%WITH_COMPILER% py.test --cov-report term-missing --cov daysgrounded -v test"
+
+after_test:
+  - "%WITH_COMPILER% %PYTHON%/python setup.py sdist bdist_wheel"
+  #- "pip install dist/*"
+  # check  Python version
+  - "%WITH_COMPILER% %PYTHON%/python -V"
+
+artifacts:
+  - path: dist\*
+
+#on_success:
+#  - "%WITH_COMPILER% %PYTHON%/python setup.py register -r pypi"
+#  - "twine upload dist/*"
+#  - "if exist daysgrounded\\doc %WITH_COMPILER% %PYTHON%/python setup.py register upload_docs --upload-dir=daysgrounded\\doc"
+
+notifications:
+  - provider: Email
+    to:
+      - jcrmatos@gmail.com
+    on_build_success: true
+    on_build_failure: true
+    #on_build_status_changed: true

appveyor/install.ps1

@@ -0,0 +1,85 @@
+# Sample script to install Python and pip under Windows
+# Authors: Olivier Grisel and Kyle Kastner
+# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+
+$BASE_URL = "https://www.python.org/ftp/python/"
+$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
+$GET_PIP_PATH = "C:\get-pip.py"
+
+
+function DownloadPython ($python_version, $platform_suffix) {
+    $webclient = New-Object System.Net.WebClient
+    $filename = "python-" + $python_version + $platform_suffix + ".msi"
+    $url = $BASE_URL + $python_version + "/" + $filename
+
+    $basedir = $pwd.Path + "\"
+    $filepath = $basedir + $filename
+    if (Test-Path $filename) {
+        Write-Host "Reusing" $filepath
+        return $filepath
+    }
+
+    # Download and retry up to 5 times in case of network transient errors.
+    Write-Host "Downloading" $filename "from" $url
+    $retry_attempts = 3
+    for($i=0; $i -lt $retry_attempts; $i++){
+        try {
+            $webclient.DownloadFile($url, $filepath)
+            break
+        }
+        Catch [Exception]{
+            Start-Sleep 1
+        }
+   }
+   Write-Host "File saved at" $filepath
+   return $filepath
+}
+
+
+function InstallPython ($python_version, $architecture, $python_home) {
+    Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
+    if (Test-Path $python_home) {
+        Write-Host $python_home "already exists, skipping."
+        return $false
+    }
+    if ($architecture -eq "32") {
+        $platform_suffix = ""
+    } else {
+        $platform_suffix = ".amd64"
+    }
+    $filepath = DownloadPython $python_version $platform_suffix
+    Write-Host "Installing" $filepath "to" $python_home
+    $args = "/qn /i $filepath TARGETDIR=$python_home"
+    Write-Host "msiexec.exe" $args
+    Start-Process -FilePath "msiexec.exe" -ArgumentList $args -Wait -Passthru
+    Write-Host "Python $python_version ($architecture) installation complete"
+    return $true
+}
+
+
+function InstallPip ($python_home) {
+    $pip_path = $python_home + "/Scripts/pip.exe"
+    $python_path = $python_home + "/python.exe"
+    if (-not(Test-Path $pip_path)) {
+        Write-Host "Installing pip..."
+        $webclient = New-Object System.Net.WebClient
+        $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
+        Write-Host "Executing:" $python_path $GET_PIP_PATH
+        Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru
+    } else {
+        Write-Host "pip already installed."
+    }
+}
+
+function InstallPackage ($python_home, $pkg) {
+    $pip_path = $python_home + "/Scripts/pip.exe"
+    & $pip_path install $pkg
+}
+
+function main () {
+    InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
+    InstallPip $env:PYTHON
+    InstallPackage $env:PYTHON wheel
+}
+
+main

appveyor/run_with_compiler.cmd

@@ -0,0 +1,47 @@
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
+::
+:: To build extensions for 64 bit Python 2, we need to configure environment
+:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
+::
+:: 32 bit builds do not require specific environment configurations.
+::
+:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
+:: cmd interpreter, at least for (SDK v7.0)
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+:: http://stackoverflow.com/a/13751649/163740
+::
+:: Author: Olivier Grisel
+:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+@ECHO OFF
+
+SET COMMAND_TO_RUN=%*
+SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+
+SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
+IF %MAJOR_PYTHON_VERSION% == "2" (
+    SET WINDOWS_SDK_VERSION="v7.0"
+) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
+    SET WINDOWS_SDK_VERSION="v7.1"
+) ELSE (
+    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+    EXIT 1
+)
+
+IF "%PYTHON_ARCH%"=="64" (
+    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
+    SET DISTUTILS_USE_SDK=1
+    SET MSSdk=1
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+) ELSE (
+    ECHO Using default MSVC build environment for 32 bit architecture
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+)