From 75a8d3114c15b8aa7d32c3cf36255f3b0877aebe Mon Sep 17 00:00:00 2001 From: Niranjan Rajendran Date: Wed, 21 Dec 2016 14:37:57 +0530 Subject: [PATCH] Bump version to 1.0.0-alpha --- README.md | 1 + app/templates/gentelella/admin/super_admin/widgets/index.html | 3 +++ app/views/super_admin/super_admin.py | 3 ++- bower.json | 3 --- config.py | 3 +++ package.json | 4 +--- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f862cb92cf..b6d65bf7c2 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ The Open Event Orga Server enables organizers to manage events from concerts to conferences and meet-ups. It offers features for events with several tracks and venues. Event managers can create invitation forms for speakers and build schedules in a drag and drop interface. The event information is stored in a database. The system provides API endpoints to fetch the data, and to modify and update it. Organizers can import and export event data in a standard compressed file format that includes the event data in JSON and binary media files like images and audio. +[![GitHub release](https://img.shields.io/github/release/fossasia/open-event-orga-server.svg?style=flat-square)](https://github.com/fossasia/open-event-orga-server/releases/latest) [![Travis branch](https://img.shields.io/travis/fossasia/open-event-orga-server/master.svg?style=flat-square)](https://travis-ci.org/fossasia/open-event-orga-server) [![Gemnasium](https://img.shields.io/gemnasium/fossasia/open-event-orga-server.svg?style=flat-square)](https://gemnasium.com/github.com/fossasia/open-event-orga-server) [![Coveralls branch](https://img.shields.io/coveralls/fossasia/open-event-orga-server/master.svg?style=flat-square&label=Coveralls+Coverage)](https://coveralls.io/github/fossasia/open-event-orga-server?branch=master) diff --git a/app/templates/gentelella/admin/super_admin/widgets/index.html b/app/templates/gentelella/admin/super_admin/widgets/index.html index 0f9ba516bd..fdfa933bd8 100644 --- a/app/templates/gentelella/admin/super_admin/widgets/index.html +++ b/app/templates/gentelella/admin/super_admin/widgets/index.html @@ -13,6 +13,9 @@
+
+ Version {{ version }} +
{% if on_kubernetes %} {% include 'gentelella/admin/super_admin/widgets/_kubernetes.html' %} diff --git a/app/views/super_admin/super_admin.py b/app/views/super_admin/super_admin.py index c792388140..2f73c6d364 100644 --- a/app/views/super_admin/super_admin.py +++ b/app/views/super_admin/super_admin.py @@ -1,6 +1,6 @@ import os -from flask import Blueprint +from flask import Blueprint, current_app as app from flask import render_template from app.helpers.data_getter import DataGetter @@ -72,6 +72,7 @@ def index_view(): commit_number=commit_number, on_heroku=on_heroku, on_kubernetes=on_kubernetes, + version=app.config['VERSION'], pods_info=pods_info, number_live_events=number_live_events, number_draft_events=number_draft_events, diff --git a/bower.json b/bower.json index bec6aefd1d..dc3f53f774 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,7 @@ { "name": "open-event-orga-server", - "version": "0.0.0", "homepage": "https://github.com/fossasia/open-event-orga-server", - "authors": [], "description": "Open Event Orga Server", - "main": "", "moduleType": [ "globals" ], diff --git a/config.py b/config.py index a36dd3d1f2..3255537301 100644 --- a/config.py +++ b/config.py @@ -3,6 +3,8 @@ basedir = os.path.abspath(os.path.dirname(__file__)) +VERSION_NAME = '1.0.0-alpha' + # available languages LANGUAGES = { 'en': 'English', @@ -20,6 +22,7 @@ class Config(object): + VERSION = VERSION_NAME DEBUG = False TESTING = False CSRF_ENABLED = True diff --git a/package.json b/package.json index 633e90e3e2..ac67ec6aac 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "open-event-orga-server", - "version": "1.0.0", - "description": "[![Build Status](https://travis-ci.org/fossasia/open-event-orga-server.svg?branch=master)](https://travis-ci.org/fossasia/open-event-orga-server)\r [![Dependency Status](https://gemnasium.com/badges/github.com/fossasia/open-event-orga-server.svg)](https://gemnasium.com/github.com/fossasia/open-event-orga-server)\r [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1ac554483fac462797ffa5a8b9adf2fa)](https://www.codacy.com/app/fossasia/open-event-orga-server?utm_source=github.com&utm_medium=referral&utm_content=fossasia/open-event-orga-server&utm_campaign=Badge_Grade)\r [![Issue Count](https://codeclimate.com/github/fossasia/open-event-orga-server/badges/issue_count.svg)](https://codeclimate.com/github/fossasia/open-event-orga-server)\r [![Test Coverage](https://codeclimate.com/github/fossasia/open-event-orga-server/badges/coverage.svg)](https://codeclimate.com/github/fossasia/open-event-orga-server/coverage)\r [![Coverage Status](https://coveralls.io/repos/github/fossasia/open-event-orga-server/badge.svg?branch=master)](https://coveralls.io/github/fossasia/open-event-orga-server?branch=master)\r [![codecov](https://codecov.io/gh/fossasia/open-event-orga-server/branch/master/graph/badge.svg)](https://codecov.io/gh/fossasia/open-event-orga-server)\r [![Gitter](https://badges.gitter.im/fossasia/open-event-orga-server.svg)](https://gitter.im/fossasia/open-event-orga-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)", + "description": "Open Event Orga Server ", "scripts": { "postinstall": "node node_modules/bower/bin/bower install" }, @@ -24,7 +23,6 @@ "app/static/admin/lib" ], "dependencies": { - "axios": "^0.15.3", "bower": "^1.7.9" } }