Skip to content

Commit

Permalink
Merge pull request #25 from ActiDoo/develop
Browse files Browse the repository at this point in the history
Deploy version 0.2.0
  • Loading branch information
Matthias Feldotto authored Apr 7, 2017
2 parents 1128bdc + a0a0cf9 commit 0f1ca70
Show file tree
Hide file tree
Showing 88 changed files with 6,621 additions and 1,637 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
source = gengine
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,10 @@ target/
*.pydevproject
/*.dbm

venv/
venv/
# Elastic Beanstalk Files
.elasticbeanstalk/*
!.elasticbeanstalk/*.cfg.yml
!.elasticbeanstalk/*.global.yml

.idea
32 changes: 27 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
language: python
dist: trusty
python:
- "2.7"

- "3.4"
- "3.5"
sudo: required
env:
- TEST_POSTGRES=/usr/lib/postgresql/9.6/bin/postgres TEST_INITDB=/usr/lib/postgresql/9.6/bin/initdb
apt:
packages:
- postgresql-9.6
- postgresql-contrib-9.6
- postgis
# command to install dependencies
install:
- python setup.py -q install

- pip install coveralls
- "pip install --upgrade -r requirements.txt"
- "pip install --upgrade -r optional-requirements.txt"
- pip install -e .

# command to run tests
script: nosetests
script: coverage run --source=gengine gengine/app/tests/runner.py

after_success:
coveralls

# deploy to pypi
deploy:
Expand All @@ -16,3 +31,10 @@ deploy:
password: $PYPI_PASSWORD
on:
tags: true

notifications:
email:
recipients:
- $ADMIN_EMAIL
on_success: always # default: change
on_failure: always # default: always
10 changes: 9 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
.
0.2.0
* Implement new rule syntax
* Add time-aware / recurring achievements
* Add optional authentication & authorization
* Introduce goal triggers
* Introduce mobile pushes
* Introduce messages
* Lots of bugfixes
* Remove Python 2.x support
4 changes: 1 addition & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include *.txt *.ini *.cfg *.rst
recursive-include gengine *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml README alembic alembic/versions/*.py alembic/env.py
recursive-include gengine_quickstart_template *.ini
include *.txt *.ini *.cfg *.rst *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.py README DUMMY LICENSE
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# gamification-engine
[![Build Status](https://travis-ci.org/ActiDoo/gamification-engine.svg?branch=master)](https://travis-ci.org/ActiDoo/gamification-engine)
[![Coverage Status](https://coveralls.io/repos/github/ActiDoo/gamification-engine/badge.svg?branch=develop)](https://coveralls.io/github/ActiDoo/gamification-engine?branch=develop)
[![Requirements Status](https://requires.io/github/ActiDoo/gamification-engine/requirements.svg?branch=master)](https://requires.io/github/ActiDoo/gamification-engine/requirements/?branch=master)
[![Heroku](https://heroku-badge.herokuapp.com/?app=gamification-engine&root=admin)](https://gamification-engine.herokuapp.com)
[![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](https://readthedocs.org/projects/gamification-engine/?badge=latest)
Expand All @@ -15,8 +16,7 @@ It is framework for developing your own solution, implemented as a **service** t

(commercial support available at https://www.gamification-software.com or together with app development at https://www.appnadoo.de)

Latest recommended version: <del>https://github.com/ActiDoo/gamification-engine/releases/latest (not yet called "stable" though)</del>
There are installation issues in the current master branch. The develop branch is working very well and is way more stable. Nevertheless the docs are out-of-date. We are currently integrating that state into a client's project and will release a new version once we find the time to update the docs and write some tests.
Latest recommended version: https://github.com/ActiDoo/gamification-engine/releases/latest

## Features

Expand All @@ -32,6 +32,7 @@ There are installation issues in the current master branch. The develop branch i
- custom definable achievement properties and rewards
- custom definable languages and translations
- dependencies between achievements (prerequisites & postconditions)
- goals can execute triggers (currently creation of messages and mobile pushes for iOS/Android)
- high performance / scalable
- administration ui

Expand Down
80 changes: 0 additions & 80 deletions alembic.ini

This file was deleted.

13 changes: 12 additions & 1 deletion development.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pyramid.includes =
pyramid_debugtoolbar
pyramid_tm

sqlalchemy.url = postgres://user:password@127.0.0.1/gengine
sqlalchemy.url = postgres://dev:dev@127.0.0.1/gengine

#reverse proxy settings
force_https = false
Expand Down Expand Up @@ -59,6 +59,17 @@ urlcache_active = false
# callback url, will be used for time-related leaderboard evaluations (daily,monthly,yearly) (TBD)
notify_progress =

enable_user_authentication = false
fallback_language = en
gcm.api_key=
gcm.package=
apns.dev.key=
apns.dev.certificate=
apns.prod.key=
apns.prod.certificate=
push_title=Gamification Engine


###
# wsgi server configuration
###
Expand Down
Loading

0 comments on commit 0f1ca70

Please sign in to comment.