Skip to content

Commit 935027c

Browse files
authored
Marking 1.0.0 (CTFd#196)
* Use <int:xxx> in routes to prevent some errors 500 (CTFd#192) * Use first_or_404() to prevent some errors 500 (CTFd#193) * Add a populating script for awards. (CTFd#191) * Creating upload_file util * Marking 1.0.0 in __init__ and starting database migrations * Upgrading some more HTML * Adding CHANGELOG.md
1 parent 01cb189 commit 935027c

21 files changed

+482
-110
lines changed

CHANGELOG.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
1.0.0 / 2017-01-24
2+
==================
3+
4+
**Implemented enhancements:**
5+
6+
- 1.0.0 release! Things work!
7+
- Manage everything from a browser
8+
- Run Containers
9+
- Themes
10+
- Plugins
11+
- Database migrations
12+
13+
**Closed issues:**
14+
15+
- Closed out 94 issues before tagging 1.0.0
16+
17+
**Merged pull requests:**
18+
19+
- Merged 42 pull requests before tagging 1.0.0

CTFd/__init__.py

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import os
22

3+
from distutils.version import StrictVersion
34
from flask import Flask
45
from jinja2 import FileSystemLoader
56
from sqlalchemy.engine.url import make_url
67
from sqlalchemy.exc import OperationalError
78
from sqlalchemy_utils import database_exists, create_database
89

9-
from utils import get_config, set_config, cache
10+
from utils import get_config, set_config, cache, migrate, migrate_upgrade
1011

12+
__version__ = '1.0.0'
1113

1214
class ThemeLoader(FileSystemLoader):
1315
def get_source(self, environment, template):
@@ -45,14 +47,23 @@ def create_app(config='CTFd.config.Config'):
4547

4648
app.db = db
4749

50+
migrate.init_app(app, db)
51+
4852
cache.init_app(app)
4953
app.cache = cache
5054

55+
version = get_config('ctf_version')
56+
57+
if not version: ## Upgrading from an unversioned CTFd
58+
set_config('ctf_version', __version__)
59+
60+
if version and (StrictVersion(version) < StrictVersion(__version__)): ## Upgrading from an older version of CTFd
61+
migrate_upgrade()
62+
set_config('ctf_version', __version__)
63+
5164
if not get_config('ctf_theme'):
5265
set_config('ctf_theme', 'original')
5366

54-
#Session(app)
55-
5667
from CTFd.views import views
5768
from CTFd.challenges import challenges
5869
from CTFd.scoreboard import scoreboard

0 commit comments

Comments
 (0)