Merge pull request #140 from Ouranosinc/config-perm-loader

version 0.9.0 improvements

.bumpversion.cfg

@@ -0,0 +1,12 @@
+[bumpversion]
+current_version = 0.9.0
+commit = True
+tag = True
+
+[bumpversion:file:README.rst]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:magpie/__meta__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'

.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 .idea/
 .eggs/
 .pytest_cache/
+coverage.xml
 build/
 coverage/
 dist/
@@ -29,4 +30,5 @@ magpie.egg-info/
 src/
 share/
 /gunicorn.app.wsgiapp
+downloads/
 /sys

.travis.yml

@@ -0,0 +1,87 @@
+language: python
+python:
+  - "2.7"
+  - "3.5"
+  - "3.6"
+sudo: false
+cache:
+  - pip
+  - directories:
+      - $HOME/conda
+      - $HOME/downloads
+# includes PR when base branch = master
+if: branch = master OR tag IS present
+env:
+  global:
+    - CONDA_HOME=$HOME/conda
+    - DOWNLOAD_CACHE=$HOME/downloads
+  matrix:
+    # FIXME: local login not functional, cannot run local tests on travis
+    #- TEST_TARGET=test-local    START_TARGET=
+    - TEST_TARGET=test-remote   START_TARGET=start
+    - TEST_TARGET=coverage      START_TARGET=
+addons:
+  postgresql: "9.6"
+postgres:
+  adapter: postgresql
+  database: magpie
+  username: postgres
+  password: qwerty
+before_install:
+  - python -V
+  - uname -a
+  - lsb_release -a
+  - export PYTHON_VERSION=${TRAVIS_PYTHON_VERSION}
+  - export CONDA_ENV=magpie-${TRAVIS_PYTHON_VERSION}
+  - export CONDA_PREFIX=$HOME/conda/envs/magpie-${TRAVIS_PYTHON_VERSION}
+  - export PATH=${CONDA_HOME}/bin:$PATH
+  - hash -r
+  - env
+  - make conda-base
+  - make sysinstall
+  - echo $CONDA_PREFIX
+  - echo $CONDA_ENV
+  #==== magpie env and constants ===
+  - mkdir -p ./env
+  - cp -f ./ci/magpie.env ./env/magpie.env
+install:
+  # TODO: remove when fixed and merged (see requirements.txt and Makefile)
+  - |
+    if [ "${TRAVIS_PYTHON_VERSION}" -eq "2.7" ]; then
+      ${CONDA_PREFIX}/bin/pip install --upgrade --force-reinstall python-openid && \
+      ${CONDA_PREFIX}/bin/pip uninstall -y python3-openid;
+    else
+      ${CONDA_PREFIX}/bin/pip install --upgrade --force-reinstall python3-openid && \
+      ${CONDA_PREFIX}/bin/pip uninstall -y python-openid;
+    fi
+  - make install install-dev
+  - make version
+before_script:
+  - psql -c 'create database magpie;' -U postgres
+  - echo $CONDA_PREFIX
+  - echo $CONDA_ENV
+  - export PYTHON_VERSION=${TRAVIS_PYTHON_VERSION}
+  - export CONDA_ENV=magpie-${TRAVIS_PYTHON_VERSION}
+  - export CONDA_PREFIX=$HOME/conda/envs/magpie-${TRAVIS_PYTHON_VERSION}
+  - export PATH=${CONDA_HOME}/bin:$PATH
+  - hash -r
+  - env
+  - echo $CONDA_PREFIX
+  - echo $CONDA_ENV
+script:
+  - export MAGPIE_LOG_LEVEL=INFO
+  - make $START_TARGET $TEST_TARGET
+notifications:
+  email: false
+jobs:
+  include:
+    - stage: deploy
+      script: echo "Deploying..."
+      deploy:
+        provider: script
+        script: make conda-env docker-push
+        skip_existing: true
+        on:
+          tags: true
+after_success:
+  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

CONTRIBUTING.rst

@@ -13,7 +13,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at francois-xavier.derue@crim.ca.
+Report bugs at francis.charette-migneault@crim.ca.
 
 If you are reporting a bug, please include:
 
@@ -54,7 +54,7 @@ Ready to contribute? Here's how to set up `magpie` for local development.
 2. Install your local copy and use a virtualenv. Assuming you have
    virtualenv installed, this is how you set up your fork for local
    development::
-    
+
     $ cd magpie/
     $ virtualenv -p python 3.5 env
     $ source env/bin/activate.csh

Dockerfile

@@ -31,4 +31,4 @@ RUN touch ~/magpie_cron_status.log
 # set /etc/environment so that cron runs using the environment variables set by docker
 RUN env >> /etc/environment
 
-CMD make start
+CMD make start cron

HISTORY.rst

@@ -3,6 +3,23 @@
 History
 =======
 
+0.9.x
+---------------------
+
+* add permissions config to auto-generate user/group rules on startup
+* fix many invalid or erroneous swagger specifications
+* attempt db creation on first migration if not existing
+* add continuous integration testing and deployment (with python 2/3 tests)
+* ensure python compatibility for Python 2.7, 3.5, 3.6
+* reduce excessive sqlalchemy logging using `MAGPIE_LOG_LEVEL >= INFO`
+* use schema API route definitions for UI calls
+
+0.8.x
+---------------------
+
+* update MagpieAdapter to match process store changes
+* provide user ID on API routes returning user info
+
 0.7.x
 ---------------------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Francois-Xavier
+Copyright (c) 2017, Francois-Xavier, Francis Charette Migneault
 All rights reserved.
 
 Permission to use, copy, modify, and/or distribute this software for any