dubacq/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

version 8.0.0

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-07-25 12:19:01 +03:00
parent 8cf0ac0ea1
commit 2f78c80dfa
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scodoc/VERSION.py
View File

@ -1,14 +1,14 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
SCOVERSION = "8.01a"
SCOVERSION = "8.0.0"
SCONAME = "ScoDoc"
SCONEWS = """
<h4>Année 2021</h4>
<ul>
<li>Réécriture du système de publication, basé sur <a href="https://flask.palletsprojects.com/en/2.0.x/">Flask</a>.
<li>Passage à Python 3 et amélioration des performances</li>
<li>Version mobile (en test)</li>
<li>Évaluations de type "deuxième session"</li>
<li>Gestion du genre neutre (pas d'affichage de la civilité)</li>

2
app/views/scolar.py
View File

@ -154,7 +154,7 @@ def about(context, REQUEST):
% (scu.get_scodoc_version())
]
H.append(
'<p>Logiciel libre écrit en <a href="http://www.python.org">Python</a>.</p><p>Utilise <a href="http://www.reportlab.org/">ReportLab</a> pour générer les documents PDF, et <a href="http://sourceforge.net/projects/pyexcelerator">pyExcelerator</a> pour le traitement des documents Excel.</p>'
'<p>Logiciel libre écrit en <a href="http://www.python.org">Python</a>.</p>'
)
H.append("<h2>Dernières évolutions</h2>" + VERSION.SCONEWS)
H.append(

6
tools/config.sh
View File

@ -50,6 +50,6 @@ export PSQL
export POSTGRES_PORT=5432
# ---
echo "SCODOC_USER=$SCODOC_USER"
echo "SCODOC_DIR=$SCODOC_DIR"
echo "SCODOC_VAR_DIR=$SCODOC_VAR_DIR"
#echo "SCODOC_USER=$SCODOC_USER"
#echo "SCODOC_DIR=$SCODOC_DIR"
#echo "SCODOC_VAR_DIR=$SCODOC_VAR_DIR"

53
tools/get_scodoc_version.sh
View File

@ -1,39 +1,52 @@
#!/bin/bash
# Get version information
# Use VERSION.py, last commit, diff, and last upstream commit date
# Use VERSION.py, VERSION, last commit, diff, and last upstream commit date
# Le répertoire de ce script:
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
source config.sh
source utils.sh
source "$SCRIPT_DIR/config.sh"
source "$SCRIPT_DIR/utils.sh"
# Source code version:
x=$(grep SCOVERSION ../app/scodoc/VERSION.py) || terminate "can't access VERSION.py" 1
x=$(grep SCOVERSION "$SCODOC_DIR/app/scodoc/VERSION.py") || terminate "can't access VERSION.py" 1
x=${x#*\"}
src_version=${x%\"*}
# last commit
git_last_commit_hash=$(git log -1 --format=%h)
git_last_commit_date=$(git log -1 --format=%ci)
release_version=$(cat "$SCODOC_DIR/VERSION")
git_up_commit_hash=$(git log -1 --format=%h origin/ScoDoc8)
git_up_commit_date=$(git log -1 --format=%ci origin/ScoDoc8)
# Check if git has local changes
nchanges=$(git status --porcelain | grep -c -v '^??')
if [ "$nchanges" -gt 0 ]
git status >& /dev/null
if [ $? = 0 ]
then
has_local_changes="yes"
# development install: use git
# last commit
git_last_commit_hash=$(git log -1 --format=%h)
git_last_commit_date=$(git log -1 --format=%ci)
git_up_commit_hash=$(git log -1 --format=%h origin/ScoDoc8)
git_up_commit_date=$(git log -1 --format=%ci origin/ScoDoc8)
# Check if git has local changes
nchanges=$(git status --porcelain | grep -c -v '^??')
if [ "$nchanges" -gt 0 ]
then
has_local_changes="yes"
else
has_local_changes="no"
fi
git_info=" ($git_up_commit_hash) $git_up_commit_date"
if [ "$has_local_changes" = "yes" ]
then
git_info="$git_info (modified)"
fi
else
has_local_changes="no"
git_info=""
fi
# Synthetic one-line version:
sco_version="$src_version ($git_up_commit_hash) $git_up_commit_date"
if [ "$has_local_changes" = "yes" ]
then
sco_version="$sco_version (modified)"
fi
sco_version="$release_version ($src_version)$git_info"
#
if [ "$1" = "-s" ]