From 684a646878636b8130ccda12fd391436b4ac258d Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Tue, 4 Sep 2018 11:03:18 -0400 Subject: [PATCH] Adding proper versioning --- package.json | 2 +- packet/__init__.py | 4 ++++ packet/_version.py | 1 + packet/templates/include/footer.html | 2 +- packet/templates/packet.html | 25 ------------------------- 5 files changed, 7 insertions(+), 27 deletions(-) create mode 100644 packet/_version.py diff --git a/package.json b/package.json index d3cc2504..76697313 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "CSH Packet", "name": "csh-packet", - "version": "3.0.0", + "version": "3.0.1", "description": "A webpacket for CSH", "bugs": { "url": "https://github.com/ComputerScienceHouse/packet/issues", diff --git a/packet/__init__.py b/packet/__init__.py index 06656faa..1047c375 100644 --- a/packet/__init__.py +++ b/packet/__init__.py @@ -10,6 +10,8 @@ from flask_pyoidc.flask_pyoidc import OIDCAuthentication from flask_sqlalchemy import SQLAlchemy +from ._version import __version__ + app = Flask(__name__) # Load default configuration and any environment variable overrides @@ -19,6 +21,8 @@ if os.path.exists(os.path.join(os.getcwd(), "config.py")): app.config.from_pyfile(os.path.join(os.getcwd(), "config.py")) +app.config["VERSION"] = __version__ + # Initialize the extensions db = SQLAlchemy(app) migrate = Migrate(app, db) diff --git a/packet/_version.py b/packet/_version.py new file mode 100644 index 00000000..05527687 --- /dev/null +++ b/packet/_version.py @@ -0,0 +1 @@ +__version__ = "3.0.1" diff --git a/packet/templates/include/footer.html b/packet/templates/include/footer.html index f000b97f..b1e9bdcf 100644 --- a/packet/templates/include/footer.html +++ b/packet/templates/include/footer.html @@ -1,6 +1,6 @@ diff --git a/packet/templates/packet.html b/packet/templates/packet.html index 0a3b7518..6056c105 100644 --- a/packet/templates/packet.html +++ b/packet/templates/packet.html @@ -62,12 +62,6 @@
Upperclassmen Score
- - - - - - {% for m in signatures.eboard %} @@ -107,12 +101,6 @@
Upperclassmen Score
NameSignature
- - - - - - {% for m in signatures.upperclassmen %} @@ -152,12 +140,6 @@
Upperclassmen Score
NameSignature
- - - - - - {% for m in signatures.freshmen %} @@ -193,13 +175,6 @@
Upperclassmen Score
NameSignature
- - - - - - - {% for m in signatures.misc %}
NameSignature