Skip to content

Commit d027404

Browse files
authored
Merge pull request #50 from devinmatte/versioning
Adding proper versioning
2 parents 2150eff + 684a646 commit d027404

File tree

5 files changed

+7
-27
lines changed

5 files changed

+7
-27
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "CSH Packet",
33
"name": "csh-packet",
4-
"version": "3.0.0",
4+
"version": "3.0.1",
55
"description": "A webpacket for CSH",
66
"bugs": {
77
"url": "https://github.com/ComputerScienceHouse/packet/issues",

packet/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
from flask_pyoidc.flask_pyoidc import OIDCAuthentication
1111
from flask_sqlalchemy import SQLAlchemy
1212

13+
from ._version import __version__
14+
1315
app = Flask(__name__)
1416

1517
# Load default configuration and any environment variable overrides
@@ -19,6 +21,8 @@
1921
if os.path.exists(os.path.join(os.getcwd(), "config.py")):
2022
app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
2123

24+
app.config["VERSION"] = __version__
25+
2226
# Initialize the extensions
2327
db = SQLAlchemy(app)
2428
migrate = Migrate(app, db)

packet/_version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "3.0.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<footer class="py-5 bg">
22
<div class="container">
3-
<p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet 3.0.0</a>
3+
<p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet {{ config["VERSION"] }}</a>
44
</p>
55
</div>
66
</footer>

packet/templates/packet.html

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ <h5>Upperclassmen Score</h5>
6262
<table class="table table-striped no-bottom-margin" data-module="table"
6363
data-searchable="true" data-sort-column="3" data-sort-order="asc"
6464
data-length-changable="true" data-paginated="false">
65-
<thead>
66-
<tr>
67-
<th>Name</th>
68-
<th>Signature</th>
69-
</tr>
70-
</thead>
7165
<tbody>
7266
{% for m in signatures.eboard %}
7367
<tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -107,12 +101,6 @@ <h5>Upperclassmen Score</h5>
107101
<table class="table table-striped no-bottom-margin" data-module="table"
108102
data-searchable="true" data-sort-column="3" data-sort-order="asc"
109103
data-length-changable="true" data-paginated="false">
110-
<thead>
111-
<tr>
112-
<th>Name</th>
113-
<th>Signature</th>
114-
</tr>
115-
</thead>
116104
<tbody>
117105
{% for m in signatures.upperclassmen %}
118106
<tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -152,12 +140,6 @@ <h5>Upperclassmen Score</h5>
152140
<table class="table table-striped no-bottom-margin" data-module="table"
153141
data-searchable="true" data-sort-column="3" data-sort-order="asc"
154142
data-length-changable="true" data-paginated="false">
155-
<thead>
156-
<tr>
157-
<th>Name</th>
158-
<th>Signature</th>
159-
</tr>
160-
</thead>
161143
<tbody>
162144
{% for m in signatures.freshmen %}
163145
<tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -193,13 +175,6 @@ <h5>Upperclassmen Score</h5>
193175
<table class="table table-striped no-bottom-margin" data-module="table"
194176
data-searchable="true" data-sort-column="3" data-sort-order="asc"
195177
data-length-changable="true" data-paginated="false">
196-
<thead>
197-
<tr>
198-
<th></th>
199-
<th>Name</th>
200-
<th>Signature</th>
201-
</tr>
202-
</thead>
203178
<tbody>
204179
{% for m in signatures.misc %}
205180
<tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>

0 commit comments

Comments
 (0)