Compare commits
26 Commits
beta
...
bda40b1935
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bda40b1935 | ||
|
|
3ba116c7fa | ||
|
|
a23f7b89e6 | ||
|
|
868f34a378 | ||
|
|
1aa5ac3c8b | ||
|
|
30893d3f34 | ||
|
|
a895d12a09 | ||
|
|
007889e48c | ||
|
|
404e2c05bd | ||
|
|
f94bd81da7 | ||
|
|
19ed58f579 | ||
|
|
e2b3d8600c | ||
|
|
9ffd380755 | ||
|
|
8dca642d0f | ||
|
|
0386b3313e | ||
|
|
a1d95603a0 | ||
|
|
ecb2df60f4 | ||
|
|
4542ed1303 | ||
|
|
5bd0596281 | ||
|
|
db7fcbfc3c | ||
|
|
9050304a30 | ||
|
|
e15beb74d1 | ||
|
|
7883ac1ae6 | ||
|
|
0028302b5a | ||
| ee43e98385 | |||
|
|
ecc56281bb |
6
.flake8
Normal file
6
.flake8
Normal file
@@ -0,0 +1,6 @@
|
||||
[flake8]
|
||||
ignore = E111,I001,I004,I003,E265,E114,E501,I005
|
||||
exclude = .git,__pycache__
|
||||
max-line-length = 160
|
||||
use-flake8-tabs = true
|
||||
tab-width = 2
|
||||
491
.pylintrc
Normal file
491
.pylintrc
Normal file
@@ -0,0 +1,491 @@
|
||||
[MASTER]
|
||||
|
||||
# A comma-separated list of package or module names from where C extensions may
|
||||
# be loaded. Extensions are loading into the active Python interpreter and may
|
||||
# run arbitrary code.
|
||||
extension-pkg-whitelist=
|
||||
|
||||
# Add files or directories to the blacklist. They should be base names, not
|
||||
# paths.
|
||||
ignore=CVS
|
||||
|
||||
# Add files or directories matching the regex patterns to the blacklist. The
|
||||
# regex matches against base names, not paths.
|
||||
ignore-patterns=
|
||||
|
||||
# Python code to execute, usually for sys.path manipulation such as
|
||||
# pygtk.require().
|
||||
#init-hook=
|
||||
|
||||
# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
|
||||
# number of processors available to use.
|
||||
jobs=1
|
||||
|
||||
# Control the amount of potential inferred values when inferring a single
|
||||
# object. This can help the performance when dealing with large functions or
|
||||
# complex, nested conditions.
|
||||
limit-inference-results=100
|
||||
|
||||
# List of plugins (as comma separated values of python modules names) to load,
|
||||
# usually to register additional checkers.
|
||||
load-plugins=
|
||||
|
||||
# Pickle collected data for later comparisons.
|
||||
persistent=yes
|
||||
|
||||
# Specify a configuration file.
|
||||
#rcfile=
|
||||
|
||||
# When enabled, pylint would attempt to guess common misconfiguration and emit
|
||||
# user-friendly hints instead of false-positive error messages.
|
||||
suggestion-mode=yes
|
||||
|
||||
# Allow loading of arbitrary C extensions. Extensions are imported into the
|
||||
# active Python interpreter and may run arbitrary code.
|
||||
unsafe-load-any-extension=no
|
||||
|
||||
|
||||
[MESSAGES CONTROL]
|
||||
|
||||
# Only show warnings with the listed confidence levels. Leave empty to show
|
||||
# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
|
||||
confidence=
|
||||
|
||||
# Disable the message, report, category or checker with the given id(s). You
|
||||
# can either give multiple identifiers separated by comma (,) or put this
|
||||
# option multiple times (only on the command line, not in the configuration
|
||||
# file where it should appear only once). You can also use "--disable=all" to
|
||||
# disable everything first and then reenable specific checks. For example, if
|
||||
# you want to run only the similarities checker, you can use "--disable=all
|
||||
# --enable=similarities". If you want to run only the classes checker, but have
|
||||
# no Warning level messages displayed, use "--disable=all --enable=classes
|
||||
# --disable=W".
|
||||
disable=missing-module-docstring,
|
||||
missing-class-docstring,
|
||||
missing-function-docstring,
|
||||
broad-except,
|
||||
logging-fstring-interpolation,
|
||||
wrong-import-order
|
||||
|
||||
# Enable the message, report, category or checker with the given id(s). You can
|
||||
# either give multiple identifier separated by comma (,) or put this option
|
||||
# multiple time (only on the command line, not in the configuration file where
|
||||
# it should appear only once). See also the "--disable" option for examples.
|
||||
enable=c-extension-no-member
|
||||
|
||||
|
||||
[REPORTS]
|
||||
|
||||
# Python expression which should return a note less than 10 (10 is the highest
|
||||
# note). You have access to the variables errors warning, statement which
|
||||
# respectively contain the number of errors / warnings messages and the total
|
||||
# number of statements analyzed. This is used by the global evaluation report
|
||||
# (RP0004).
|
||||
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
|
||||
|
||||
# snmp used to display messages. This is a python new-style format string
|
||||
# used to format the message information. See doc for all details.
|
||||
#msg-snmp=
|
||||
|
||||
# Set the output format. Available formats are text, parseable, colorized, json
|
||||
# and msvs (visual studio). You can also give a reporter class, e.g.
|
||||
# mypackage.mymodule.MyReporterClass.
|
||||
output-format=text
|
||||
|
||||
# Tells whether to display a full report or only the messages.
|
||||
reports=no
|
||||
|
||||
# Activate the evaluation score.
|
||||
score=yes
|
||||
|
||||
|
||||
[REFACTORING]
|
||||
|
||||
# Maximum number of nested blocks for function / method body
|
||||
max-nested-blocks=5
|
||||
|
||||
# Complete name of functions that never returns. When checking for
|
||||
# inconsistent-return-statements if a never returning function is called then
|
||||
# it will be considered as an explicit return statement and no message will be
|
||||
# printed.
|
||||
never-returning-functions=sys.exit
|
||||
|
||||
|
||||
[SIMILARITIES]
|
||||
|
||||
# Ignore comments when computing similarities.
|
||||
ignore-comments=yes
|
||||
|
||||
# Ignore docstrings when computing similarities.
|
||||
ignore-docstrings=yes
|
||||
|
||||
# Ignore imports when computing similarities.
|
||||
ignore-imports=no
|
||||
|
||||
# Minimum lines number of a similarity.
|
||||
min-similarity-lines=4
|
||||
|
||||
|
||||
[MISCELLANEOUS]
|
||||
|
||||
# List of note tags to take in consideration, separated by a comma.
|
||||
notes=FIXME,
|
||||
XXX,
|
||||
TODO
|
||||
|
||||
|
||||
[SPELLING]
|
||||
|
||||
# Limits count of emitted suggestions for spelling mistakes.
|
||||
max-spelling-suggestions=4
|
||||
|
||||
# Spelling dictionary name. Available dictionaries: none. To make it working
|
||||
# install python-enchant package..
|
||||
spelling-dict=
|
||||
|
||||
# List of comma separated words that should not be checked.
|
||||
spelling-ignore-words=
|
||||
|
||||
# A path to a file that contains private dictionary; one word per line.
|
||||
spelling-private-dict-file=
|
||||
|
||||
# Tells whether to store unknown words to indicated private dictionary in
|
||||
# --spelling-private-dict-file option instead of raising a message.
|
||||
spelling-store-unknown-words=no
|
||||
|
||||
|
||||
[STRING]
|
||||
|
||||
# This flag controls whether the implicit-str-concat-in-sequence should
|
||||
# generate a warning on implicit string concatenation in sequences defined over
|
||||
# several lines.
|
||||
check-str-concat-over-line-jumps=no
|
||||
|
||||
|
||||
[LOGGING]
|
||||
|
||||
# Format style used to check logging format string. `old` means using %
|
||||
# formatting, while `new` is for `{}` formatting.
|
||||
logging-format-style=old
|
||||
|
||||
# Logging modules to check that the string format arguments are in logging
|
||||
# function parameter format.
|
||||
logging-modules=
|
||||
|
||||
|
||||
[BASIC]
|
||||
|
||||
# Naming style matching correct argument names.
|
||||
argument-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct argument names. Overrides argument-
|
||||
# naming-style.
|
||||
#argument-rgx=
|
||||
|
||||
# Naming style matching correct attribute names.
|
||||
attr-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct attribute names. Overrides attr-naming-
|
||||
# style.
|
||||
#attr-rgx=
|
||||
|
||||
# Bad variable names which should always be refused, separated by a comma.
|
||||
bad-names=foo,
|
||||
bar,
|
||||
baz,
|
||||
toto,
|
||||
tutu,
|
||||
tata
|
||||
|
||||
# Naming style matching correct class attribute names.
|
||||
class-attribute-naming-style=any
|
||||
|
||||
# Regular expression matching correct class attribute names. Overrides class-
|
||||
# attribute-naming-style.
|
||||
#class-attribute-rgx=
|
||||
|
||||
# Naming style matching correct class names.
|
||||
class-naming-style=PascalCase
|
||||
|
||||
# Regular expression matching correct class names. Overrides class-naming-
|
||||
# style.
|
||||
#class-rgx=
|
||||
|
||||
# Naming style matching correct constant names.
|
||||
const-naming-style=UPPER_CASE
|
||||
|
||||
# Regular expression matching correct constant names. Overrides const-naming-
|
||||
# style.
|
||||
#const-rgx=
|
||||
|
||||
# Minimum line length for functions/classes that require docstrings, shorter
|
||||
# ones are exempt.
|
||||
docstring-min-length=-1
|
||||
|
||||
# Naming style matching correct function names.
|
||||
function-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct function names. Overrides function-
|
||||
# naming-style.
|
||||
#function-rgx=
|
||||
|
||||
# Good variable names which should always be accepted, separated by a comma.
|
||||
good-names=i,
|
||||
j,
|
||||
k,
|
||||
ex,
|
||||
e,
|
||||
Run,
|
||||
_
|
||||
|
||||
# Include a hint for the correct naming format with invalid-name.
|
||||
include-naming-hint=no
|
||||
|
||||
# Naming style matching correct inline iteration names.
|
||||
inlinevar-naming-style=any
|
||||
|
||||
# Regular expression matching correct inline iteration names. Overrides
|
||||
# inlinevar-naming-style.
|
||||
#inlinevar-rgx=
|
||||
|
||||
# Naming style matching correct method names.
|
||||
method-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct method names. Overrides method-naming-
|
||||
# style.
|
||||
#method-rgx=
|
||||
|
||||
# Naming style matching correct module names.
|
||||
module-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct module names. Overrides module-naming-
|
||||
# style.
|
||||
#module-rgx=
|
||||
|
||||
# Colon-delimited sets of names that determine each other's naming style when
|
||||
# the name regexes allow several styles.
|
||||
name-group=
|
||||
|
||||
# Regular expression which should only match function or class names that do
|
||||
# not require a docstring.
|
||||
no-docstring-rgx=^_
|
||||
|
||||
# List of decorators that produce properties, such as abc.abstractproperty. Add
|
||||
# to this list to register other decorators that produce valid properties.
|
||||
# These decorators are taken in consideration only for invalid-name.
|
||||
property-classes=abc.abstractproperty
|
||||
|
||||
# Naming style matching correct variable names.
|
||||
variable-naming-style=snake_case
|
||||
|
||||
# Regular expression matching correct variable names. Overrides variable-
|
||||
# naming-style.
|
||||
#variable-rgx=
|
||||
|
||||
|
||||
[TYPECHECK]
|
||||
|
||||
# List of decorators that produce context managers, such as
|
||||
# contextlib.contextmanager. Add to this list to register other decorators that
|
||||
# produce valid context managers.
|
||||
contextmanager-decorators=contextlib.contextmanager
|
||||
|
||||
# List of members which are set dynamically and missed by pylint inference
|
||||
# system, and so shouldn't trigger E1101 when accessed. Python regular
|
||||
# expressions are accepted.
|
||||
generated-members=
|
||||
|
||||
# Tells whether missing members accessed in mixin class should be ignored. A
|
||||
# mixin class is detected if its name ends with "mixin" (case insensitive).
|
||||
ignore-mixin-members=yes
|
||||
|
||||
# Tells whether to warn about missing members when the owner of the attribute
|
||||
# is inferred to be None.
|
||||
ignore-none=yes
|
||||
|
||||
# This flag controls whether pylint should warn about no-member and similar
|
||||
# checks whenever an opaque object is returned when inferring. The inference
|
||||
# can return multiple potential results while evaluating a Python object, but
|
||||
# some branches might not be evaluated, which results in partial inference. In
|
||||
# that case, it might be useful to still emit no-member and other checks for
|
||||
# the rest of the inferred objects.
|
||||
ignore-on-opaque-inference=yes
|
||||
|
||||
# List of class names for which member attributes should not be checked (useful
|
||||
# for classes with dynamically set attributes). This supports the use of
|
||||
# qualified names.
|
||||
ignored-classes=optparse.Values,thread._local,_thread._local
|
||||
|
||||
# List of module names for which member attributes should not be checked
|
||||
# (useful for modules/projects where namespaces are manipulated during runtime
|
||||
# and thus existing member attributes cannot be deduced by static analysis. It
|
||||
# supports qualified module names, as well as Unix pattern matching.
|
||||
ignored-modules=
|
||||
|
||||
# Show a hint with possible names when a member name was not found. The aspect
|
||||
# of finding the hint is based on edit distance.
|
||||
missing-member-hint=yes
|
||||
|
||||
# The minimum edit distance a name should have in order to be considered a
|
||||
# similar match for a missing member name.
|
||||
missing-member-hint-distance=1
|
||||
|
||||
# The total number of similar names that should be taken in consideration when
|
||||
# showing a hint for a missing member.
|
||||
missing-member-max-choices=1
|
||||
|
||||
|
||||
[VARIABLES]
|
||||
|
||||
# List of additional names supposed to be defined in builtins. Remember that
|
||||
# you should avoid defining new builtins when possible.
|
||||
additional-builtins=
|
||||
|
||||
# Tells whether unused global variables should be treated as a violation.
|
||||
allow-global-unused-variables=yes
|
||||
|
||||
# List of strings which can identify a callback function by name. A callback
|
||||
# name must start or end with one of those strings.
|
||||
callbacks=cb_,
|
||||
_cb
|
||||
|
||||
# A regular expression matching the name of dummy variables (i.e. expected to
|
||||
# not be used).
|
||||
dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
|
||||
|
||||
# Argument names that match this expression will be ignored. Default to name
|
||||
# with leading underscore.
|
||||
ignored-argument-names=_.*|^ignored_|^unused_
|
||||
|
||||
# Tells whether we should check for unused import in __init__ files.
|
||||
init-import=no
|
||||
|
||||
# List of qualified module names which can have objects that can redefine
|
||||
# builtins.
|
||||
redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
|
||||
|
||||
|
||||
[FORMAT]
|
||||
|
||||
# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
|
||||
expected-line-ending-format=
|
||||
|
||||
# Regexp for a line that is allowed to be longer than the limit.
|
||||
ignore-long-lines=^\s*(# )?<?https?://\S+>?$
|
||||
|
||||
# Number of spaces of indent required inside a hanging or continued line.
|
||||
indent-after-paren=2
|
||||
|
||||
# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
|
||||
# tab).
|
||||
indent-string=' '
|
||||
|
||||
# Maximum number of characters on a single line.
|
||||
max-line-length=200
|
||||
|
||||
# Maximum number of lines in a module.
|
||||
max-module-lines=1000
|
||||
|
||||
# Allow the body of a class to be on the same line as the declaration if body
|
||||
# contains single statement.
|
||||
single-line-class-stmt=no
|
||||
|
||||
# Allow the body of an if to be on the same line as the test if there is no
|
||||
# else.
|
||||
single-line-if-stmt=no
|
||||
|
||||
|
||||
[DESIGN]
|
||||
|
||||
# Maximum number of arguments for function / method.
|
||||
max-args=5
|
||||
|
||||
# Maximum number of attributes for a class (see R0902).
|
||||
max-attributes=7
|
||||
|
||||
# Maximum number of boolean expressions in an if statement.
|
||||
max-bool-expr=5
|
||||
|
||||
# Maximum number of branch for function / method body.
|
||||
max-branches=12
|
||||
|
||||
# Maximum number of locals for function / method body.
|
||||
max-locals=15
|
||||
|
||||
# Maximum number of parents for a class (see R0901).
|
||||
max-parents=7
|
||||
|
||||
# Maximum number of public methods for a class (see R0904).
|
||||
max-public-methods=20
|
||||
|
||||
# Maximum number of return / yield for function / method body.
|
||||
max-returns=6
|
||||
|
||||
# Maximum number of statements in function / method body.
|
||||
max-statements=50
|
||||
|
||||
# Minimum number of public methods for a class (see R0903).
|
||||
min-public-methods=2
|
||||
|
||||
|
||||
[IMPORTS]
|
||||
|
||||
# Allow wildcard imports from modules that define __all__.
|
||||
allow-wildcard-with-all=no
|
||||
|
||||
# Analyse import fallback blocks. This can be used to support both Python 2 and
|
||||
# 3 compatible code, which means that the block might have code that exists
|
||||
# only in one or another interpreter, leading to false positives when analysed.
|
||||
analyse-fallback-blocks=no
|
||||
|
||||
# Deprecated modules which should not be used, separated by a comma.
|
||||
deprecated-modules=optparse,tkinter.tix
|
||||
|
||||
# Create a graph of external dependencies in the given file (report RP0402 must
|
||||
# not be disabled).
|
||||
ext-import-graph=
|
||||
|
||||
# Create a graph of every (i.e. internal and external) dependencies in the
|
||||
# given file (report RP0402 must not be disabled).
|
||||
import-graph=
|
||||
|
||||
# Create a graph of internal dependencies in the given file (report RP0402 must
|
||||
# not be disabled).
|
||||
int-import-graph=
|
||||
|
||||
# Force import order to recognize a module as part of the standard
|
||||
# compatibility libraries.
|
||||
known-standard-library=
|
||||
|
||||
# Force import order to recognize a module as part of a third party library.
|
||||
known-third-party=enchant
|
||||
|
||||
|
||||
[CLASSES]
|
||||
|
||||
# List of method names used to declare (i.e. assign) instance attributes.
|
||||
defining-attr-methods=__init__,
|
||||
__new__,
|
||||
setUp
|
||||
|
||||
# List of member names, which should be excluded from the protected access
|
||||
# warning.
|
||||
exclude-protected=_asdict,
|
||||
_fields,
|
||||
_replace,
|
||||
_source,
|
||||
_make
|
||||
|
||||
# List of valid names for the first argument in a class method.
|
||||
valid-classmethod-first-arg=cls
|
||||
|
||||
# List of valid names for the first argument in a metaclass class method.
|
||||
valid-metaclass-classmethod-first-arg=cls
|
||||
|
||||
|
||||
[EXCEPTIONS]
|
||||
|
||||
# Exceptions that will emit a warning when being caught. Defaults to
|
||||
# "BaseException, Exception".
|
||||
overgeneral-exceptions=BaseException,
|
||||
Exception
|
||||
20
.yamllint
Normal file
20
.yamllint
Normal file
@@ -0,0 +1,20 @@
|
||||
---
|
||||
extends: default
|
||||
|
||||
rules:
|
||||
line-length: disable
|
||||
colons:
|
||||
level: warning
|
||||
indentation:
|
||||
level: warning
|
||||
indent-sequences: consistent
|
||||
commas:
|
||||
level: warning
|
||||
brackets:
|
||||
level: warning
|
||||
hyphens:
|
||||
level: warning
|
||||
new-line-at-end-of-file: disable
|
||||
quoted-strings:
|
||||
required: only-when-needed
|
||||
level: warning
|
||||
33
Makefile
33
Makefile
@@ -1,45 +1,50 @@
|
||||
.PHONY: clean distclean install run stop
|
||||
.PHONY: clean distclean install run stop all docker-build docker-run docker-stop docker-all
|
||||
|
||||
install:
|
||||
set -e ;\
|
||||
THSF_DIR=$$(pwd); \
|
||||
echo [+] Déploiement dans $$THSF_DIR; \
|
||||
python3 -m venv thsf_venv; \
|
||||
python -m venv thsf_venv; \
|
||||
. thsf_venv/bin/activate; \
|
||||
pip3 install -r requirements.txt ;\
|
||||
pip3 install . ;\
|
||||
pip3 install gunicorn; \
|
||||
pip install -r requirements.txt ;\
|
||||
pip install . ;\
|
||||
pip install gunicorn;
|
||||
|
||||
run:
|
||||
set -e ;\
|
||||
THSF_DIR=$$(pwd); \
|
||||
echo [+] Démarrage dans $$THSF_DIR; \
|
||||
. thsf_venv/bin/activate; \
|
||||
thsf_venv/bin/gunicorn -D -p thsf.pid -w 4 -b 127.0.0.1:8042 'thsf:app'
|
||||
thsf_venv/bin/gunicorn -p thsf.pid -w 4 -b 0.0.0.0:8042 'thsf:app'
|
||||
|
||||
debug:
|
||||
set -e ;\
|
||||
THSF_DIR=$$(pwd); \
|
||||
echo [+] Démarrage dans $$THSF_DIR; \
|
||||
. thsf_venv/bin/activate; \
|
||||
thsf_venv/bin/gunicorn -p thsf.pid -w 4 -b 127.0.0.1:8042 'thsf:app'
|
||||
thsf_venv/bin/gunicorn -p thsf.pid -w 4 -b 0.0.0.0:8042 'thsf:app'
|
||||
|
||||
stop:
|
||||
-set -e;\
|
||||
THSF_DIR=$$(pwd); \
|
||||
echo [+] Arrêt dans $$THSF_DIR; \
|
||||
kill -15 $$(cat $$THSF_DIR/thsf.pid); \
|
||||
rm thsf.pid
|
||||
|
||||
clean:
|
||||
-set -e ;\
|
||||
THSF_DIR=$$(pwd); \
|
||||
echo [+] Nettoyage dans $$THSF_DIR; \
|
||||
rm -Rf ./build ./src/thsf.egg-info ./thsf.pid ./thsf.log; \
|
||||
. thsf_venv/bin/activate; \
|
||||
pip3 uninstall thsf -y
|
||||
pip uninstall thsf -y
|
||||
|
||||
distclean: clean
|
||||
rm -Rf thsf_venv/
|
||||
|
||||
all: stop clean install run
|
||||
|
||||
docker-build:
|
||||
docker-compose build
|
||||
|
||||
docker-run:
|
||||
docker-compose up -d
|
||||
|
||||
docker-stop:
|
||||
-docker-compose down
|
||||
|
||||
docker-all: docker-stop docker-build docker-run
|
||||
|
||||
80
README.md
80
README.md
@@ -1,36 +1,66 @@
|
||||
# THSF.NET
|
||||
|
||||
Le site du THSF
|
||||
Le site du **THSF**
|
||||
|
||||
## Modifier le site
|
||||
## Fonctionnement du site
|
||||
|
||||
Le site du **THSF** est une application *Python Flask* configurée à partir du fichier `config.yml` situé à la racine du dépôt.
|
||||
|
||||
Il n'est généralement pas nécessaire de modifier ce fichier de configuration, cependant il ets possible d'augmenter le niveau de *log* en modifiant la clef de configuration `log::root::level` en la passant à `DEBUG` (valeur en production: `INFO`).
|
||||
|
||||
### Conteneur
|
||||
|
||||
Un fichier `thsf.Dockerfile` ainsi que le fichier `docker-compose.yml` correspondant permettront de rapidement démarrer localement une instance du site du **THSF**.
|
||||
|
||||
### Démarrer une instance du site du **THSF**
|
||||
|
||||
Assurez vous d'avoir l'environnement de conteneurisation adéquat (i.e: *docker* + *docker-compose*) puis exécuter directement les commandes suivantes depuis la racine du dépôt:
|
||||
|
||||
```shell
|
||||
docker-compose build
|
||||
docker-compose up -d
|
||||
```
|
||||
|
||||
Le site du **THSF** écoutera alors sur le port *TCP/8042*:
|
||||
|
||||
`http://127.0.0.1:8042`
|
||||
|
||||
### Arrêter une instance du site du **THSF**
|
||||
|
||||
```shell
|
||||
docker-compose down
|
||||
```
|
||||
|
||||
## Apporter des modifications au site
|
||||
|
||||
**Important**: Avant d'apporter la moindre modification, pensez à créer une nouvelle branche à l'aide de la commande suivante en remplaçant `ma_branche` par le nom de votre branche:
|
||||
|
||||
```shell
|
||||
git checkout -b ma_branche
|
||||
```
|
||||
|
||||
Le code de l'application *Python Flask* se situe dans le répertoire `src` et une fois votre branche créée, vous pouvez apporter toutes les modification souhaitées.
|
||||
|
||||
### Créer un patch contenant toutes vos modifications
|
||||
|
||||
Une fois satisfaits de vos modifications vous pouvez créer un *patch* regroupant l'ensemble de vos modifications à l'aide la commande suivante
|
||||
|
||||
```shell
|
||||
git diff -u --patch master..ma_branche > mes_modifications.patch
|
||||
```
|
||||
|
||||
Vous pouvez faire parvenir votre fichier de *patch* à **contact@tetalab.org** pour que vos modifications soient incorporées au site après vérification.
|
||||
|
||||
### Publication automatisée des modifications
|
||||
|
||||
**Note**: Cette partie ne concerne que les personnes ayant un accès en écriture sur le dépôt *Git*.
|
||||
|
||||
Il n'est **pas possible** de pousser directement des modifications sur la branche `master`.
|
||||
|
||||
Pour modifier le site, il est nécessaire de créer une branche spécifique et d'y pousser vos modifications.
|
||||
|
||||
## Publication du site
|
||||
|
||||
Lorsque vous êtes satisfaits de vos modifications, vous pouvez créer [une demande d'ajout](https://git.tetalab.org/tetalab/thsf.net/pulls) de votre branche sur la branche `master`.
|
||||
|
||||
Lorsque la demande de fusion sera acceptée (vous pouvez auto-accepter vos demandes de fusion), vos modifications seront automatiquement publiées sur [le site du THSF](https://www.thsf.net).
|
||||
Lorsque la demande de fusion sera acceptée, vos modifications seront automatiquement publiées sur [le site du THSF](https://www.thsf.net).
|
||||
|
||||
### Personnalisation de la publication
|
||||
|
||||
Afin de rendre le processus plus souple, il est possible de personnaliser la livraison en plaçant **à la racine du dépôt** un fichier `Makefile` contenant une cible `all` qui sera systématiquement exécutée.
|
||||
|
||||
C'est dans cette cible `all` que vous pourrez mettre toutes vos commandes personnalisées, typiquement l'installation de modules `python`, etc.
|
||||
|
||||
Le processus de publication est le suivant:
|
||||
|
||||
1. Le site actuellement en production est **supprimé**
|
||||
|
||||
2. La branche `master` du présent dépôt est cloné sur le serveur hébergeant le site du **THSF**
|
||||
|
||||
3. Si un fichier `Makefile` se trouve **à la racine du dépôt**, la cible `all` (i.e: `make all`) est automatiquement exécutée.
|
||||
|
||||
|
||||
## Contrôle de qualité et tests
|
||||
|
||||
Aucun contrôle de qualité ou de tests n'est mis en place. Vous êtes seuls sur le coup.
|
||||
|
||||
Soyez responsable et **testez vos modifications sur votre machine locale avant de fusionner votre branche** sur la branche `master`.
|
||||
Vous pouvez auto-accepter vos demandes de fusion si vous faites partie des développeurs autorisés.
|
||||
|
||||
@@ -14,7 +14,7 @@ log:
|
||||
handlers: [wsgi]
|
||||
propagate: no
|
||||
root:
|
||||
level: DEBUG
|
||||
level: INFO
|
||||
handlers: [wsgi]
|
||||
app:
|
||||
secret_key: xxx
|
||||
@@ -57,7 +57,7 @@ navbar:
|
||||
- name: Tables rondes
|
||||
classes: fa-solid fa-users-line
|
||||
url: /discussions
|
||||
- name: Installations artistiques
|
||||
- name: Installation
|
||||
classes: fa-solid fa-palette
|
||||
url: /exhibitions
|
||||
- name: Présentations
|
||||
|
||||
12
docker-compose.yml
Normal file
12
docker-compose.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
version: "2"
|
||||
services:
|
||||
thsf:
|
||||
build:
|
||||
dockerfile: thsf.Dockerfile
|
||||
context: .
|
||||
extra_hosts:
|
||||
- "23.thsf.net:192.168.122.26"
|
||||
ports:
|
||||
- "127.0.0.1:8042:8042"
|
||||
image: thsf:latest
|
||||
container_name: thsf
|
||||
@@ -41,7 +41,7 @@ try:
|
||||
schedule = Schedule()
|
||||
navbar = Navbar(config=app.local_config["navbar"])
|
||||
except Exception as err:
|
||||
logger.critical("[{}] {}".format(err.__class__, str(err)))
|
||||
logger.critical(f"[{err.__class__}] {str(err)}")
|
||||
sys.exit(1)
|
||||
|
||||
if app.local_config["log"]["root"]["level"] != "DEBUG":
|
||||
@@ -54,18 +54,19 @@ if app.local_config["log"]["root"]["level"] != "DEBUG":
|
||||
def page_not_found(err):
|
||||
return redirect(url_for('index'))
|
||||
|
||||
|
||||
def get_slots():
|
||||
return backend.get(endpoint=f"events/{app.local_config['pretalx']['event']}/schedules/{app.local_config['pretalx']['schedule']}/").json()
|
||||
|
||||
def get_speaker_biography(name):
|
||||
|
||||
def get_speaker_biography(code):
|
||||
try:
|
||||
speaker_info = backend.get(endpoint=f"events/{app.local_config['pretalx']['event']}/speakers/", params={"q": name}).json()
|
||||
logging.info(speaker_info)
|
||||
return speaker_info["results"][0]["biography"].strip()
|
||||
speaker_info = backend.get(endpoint=f"events/{app.local_config['pretalx']['event']}/speakers/{code}/").json()
|
||||
return speaker_info.get("biography").strip()
|
||||
except Exception as err:
|
||||
logging.error(f"UnknownSpeakerError: {name}")
|
||||
return None
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# -- Custom filters
|
||||
# ------------------------------------------------------------------------------
|
||||
@@ -79,18 +80,20 @@ def date2dmyhm(date):
|
||||
hour, minutes = (splitted_time[0], splitted_time[1].split("+")[0])
|
||||
return f"{day}/{month} {hour}:{minutes}"
|
||||
|
||||
|
||||
@app.template_filter('date2dayclass')
|
||||
def date2dayclass(date):
|
||||
classes = {"26/05": "bg1",
|
||||
"27/05": "bg2",
|
||||
"28/05": "bg3",}
|
||||
"28/05": "bg3"}
|
||||
splitted_date = date.split("-")
|
||||
month, day = (splitted_date[1],
|
||||
splitted_date[2].split("T")[0])
|
||||
return classes[f"{day}/{month}"]
|
||||
|
||||
|
||||
@app.template_filter('toicon')
|
||||
def date2dmyhm(slot_type):
|
||||
def type2icon(slot_type):
|
||||
slot_types = {"Projection": "fa-solid fa-film",
|
||||
"Presentation Courte": "fa-solid fa-person-chalkboard",
|
||||
"DJ Set": "fa-solid fa-guitar",
|
||||
@@ -98,9 +101,10 @@ def date2dmyhm(slot_type):
|
||||
"Présentation": "fa-solid fa-person-chalkboard",
|
||||
"Table Ronde": "fa-solid fa-users-line",
|
||||
"Atelier": "fa-solid fa-screwdriver-wrench",
|
||||
"Exposition": "fa-solid fa-palette"}
|
||||
"Installation": "fa-solid fa-palette"}
|
||||
return slot_types[slot_type]
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# -- Routes
|
||||
# ------------------------------------------------------------------------------
|
||||
@@ -114,32 +118,38 @@ def index():
|
||||
return render_template("index.html",
|
||||
navbar=navbar.get_from_page(page="/"))
|
||||
|
||||
|
||||
@app.route('/planning', methods=['GET'])
|
||||
def planning():
|
||||
slots = get_slots()
|
||||
for slot in slots.get("slots"):
|
||||
for speaker in slot.get("speakers"):
|
||||
speaker["biography"] = get_speaker_biography(speaker.get("name"))
|
||||
speaker["biography"] = get_speaker_biography(speaker.get("code"))
|
||||
return render_template("planning.html",
|
||||
slots=sorted(slots.get("slots"),
|
||||
key=lambda slot: slot.get("slot").get("start")),
|
||||
navbar=navbar.get_from_page(page="/planning"))
|
||||
navbar=navbar.get_from_page(page="/planning"),
|
||||
filter=["concert", "dj set", "panel discussion", "talk", "screening"])
|
||||
|
||||
|
||||
@app.route('/place', methods=['GET'])
|
||||
def place():
|
||||
return render_template("index.html",
|
||||
return render_template("place.html",
|
||||
navbar=navbar.get_from_page(page="/place"))
|
||||
|
||||
|
||||
@app.route('/food', methods=['GET'])
|
||||
def food():
|
||||
return render_template("index.html",
|
||||
return render_template("food.html",
|
||||
navbar=navbar.get_from_page(page="/food"))
|
||||
|
||||
|
||||
@app.route('/goodies', methods=['GET'])
|
||||
def goodies():
|
||||
return render_template("goodies.html",
|
||||
navbar=navbar.get_from_page(page="/goodies"))
|
||||
|
||||
|
||||
@app.route('/concerts', methods=['GET'])
|
||||
def concerts():
|
||||
slots = get_slots()
|
||||
@@ -149,6 +159,7 @@ def concerts():
|
||||
navbar=navbar.get_from_page(page="/concerts"),
|
||||
filter=["concert", "dj set"])
|
||||
|
||||
|
||||
@app.route('/workshops', methods=['GET'])
|
||||
def workshops():
|
||||
slots = get_slots()
|
||||
@@ -158,6 +169,7 @@ def workshops():
|
||||
navbar=navbar.get_from_page(page="/workshops"),
|
||||
filter=["workshop"])
|
||||
|
||||
|
||||
@app.route('/screenings', methods=['GET'])
|
||||
def screenings():
|
||||
slots = get_slots()
|
||||
@@ -167,6 +179,7 @@ def screenings():
|
||||
navbar=navbar.get_from_page(page="/screenings"),
|
||||
filter=["screening"])
|
||||
|
||||
|
||||
@app.route('/discussions', methods=['GET'])
|
||||
def discussions():
|
||||
slots = get_slots()
|
||||
@@ -176,6 +189,7 @@ def discussions():
|
||||
navbar=navbar.get_from_page(page="/discussions"),
|
||||
filter=["panel discussion"])
|
||||
|
||||
|
||||
@app.route('/exhibitions', methods=['GET'])
|
||||
def exhibitions():
|
||||
slots = get_slots()
|
||||
@@ -183,7 +197,8 @@ def exhibitions():
|
||||
slots=sorted(slots.get("slots"),
|
||||
key=lambda slot: slot.get("slot").get("start")),
|
||||
navbar=navbar.get_from_page(page="/exhibitions"),
|
||||
filter=["exhibition"])
|
||||
filter=["installation"])
|
||||
|
||||
|
||||
@app.route('/talks', methods=['GET'])
|
||||
def talks():
|
||||
|
||||
@@ -10,6 +10,7 @@ a {
|
||||
a:hover {
|
||||
color: var(--main-color);
|
||||
cursor: pointer;
|
||||
text-shadow: -1px -1px 0 var(--alt-main-color), 1px -1px 0 var(--alt-main-color), -1px 1px 0 var(--alt-main-color), 1px 1px 0 var(--alt-main-color);
|
||||
}
|
||||
|
||||
.content > p,
|
||||
|
||||
@@ -64,3 +64,19 @@
|
||||
.slot_img {
|
||||
width: 18em;
|
||||
}
|
||||
|
||||
.abstract a,
|
||||
.speaker_biography a {
|
||||
color: var(--main-bg-color);
|
||||
}
|
||||
|
||||
.abstract a:hover,
|
||||
.speaker_biography a:hover {
|
||||
color: var(--alt-color);
|
||||
text-shadow: -1px -1px 0 var(--main-bg-color), 1px -1px 0 var(--main-bg-color), -1px 1px 0 var(--main-bg-color), 1px 1px 0 var(--main-bg-color);
|
||||
}
|
||||
|
||||
.abstract strong,
|
||||
.speaker_biography strong {
|
||||
font-family: pfdintextcomppromedium;
|
||||
}
|
||||
|
||||
BIN
src/thsf/static/images/fmr.png
Normal file
BIN
src/thsf/static/images/fmr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
BIN
src/thsf/static/images/tv-bruits.png
Normal file
BIN
src/thsf/static/images/tv-bruits.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
@@ -64,12 +64,24 @@
|
||||
</a>
|
||||
</div>
|
||||
<div class="subpartners">
|
||||
<a href="https://www.tvbruits.org/" target="_new">
|
||||
<img src="{{ url_for('static', filename='images/tv-bruits.png')}}"
|
||||
alt="TV Bruits"
|
||||
title="TV Bruits"
|
||||
class="logo_partner">
|
||||
</a>
|
||||
<a href="https://www.tetaneutral.net/" target="_new">
|
||||
<img src="{{ url_for('static', filename='images/tetaneutral.png')}}"
|
||||
alt="Tetaneutral"
|
||||
title="Tetaneutral"
|
||||
class="logo_partner">
|
||||
</a>
|
||||
<a href="https://www.radio-fmr.net/" target="_new">
|
||||
<img src="{{ url_for('static', filename='images/fmr.png')}}"
|
||||
alt="Radio FMR"
|
||||
title="Radio FMR"
|
||||
class="logo_partner">
|
||||
</a>
|
||||
</div>
|
||||
<div class="subpartners">
|
||||
<a href="https://clutchmag.fr/" target="_new">
|
||||
|
||||
14
src/thsf/templates/food.html
Normal file
14
src/thsf/templates/food.html
Normal file
@@ -0,0 +1,14 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<div class="logo_wrapper">
|
||||
<img class="logo"
|
||||
src="{{ url_for('static', filename='images/logo.svg') }}"
|
||||
alt="THSF 2023 - S/Extraire"
|
||||
title="THSF 2023 - S/Extraire">
|
||||
</div>
|
||||
<div class="content">
|
||||
<h2>Restauration</h2>
|
||||
<p>La restauration sur place est prévue.</p>
|
||||
<p>Détails à venir...</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -13,7 +13,7 @@
|
||||
src="{{ url_for('static', filename='images/stickers.webp') }}"
|
||||
alt="Stickers"
|
||||
title="Stickers">
|
||||
Pour faire du <strong>Toulouse Hacker Space Factory</strong> un événement toujours différent des autres festivals <strong>votre soutien financier</strong> est nécessaire.
|
||||
Pour faire du <strong>Toulouse Hacker Space Factory</strong> un événement toujours différent des autres festivals <a href="https://www.leetchi.com/c/thsf23" target="_new">votre soutien financier</a> est nécessaire.
|
||||
</p>
|
||||
<p class="goodies">
|
||||
<img class="right"
|
||||
|
||||
@@ -16,12 +16,12 @@
|
||||
<h2>Le THSF est enfin de retour !</h2>
|
||||
<p>Nous vous invitons à passer un week-end de 3 jours à <a href="https://www.cinemas-utopia.org/toulouse/" target="_new">Utopia Borderouge Toulouse</a> pour partager avec vous nos projets, nos réflexions, nos performances, nos poésies et nos doutes sur la technologie.</p>
|
||||
|
||||
<p>Après avoir été soutenu et accueilli pendant 10 ans par <a href="https://vive.mixart-myrys.org/" target="_new">Mix'Art Myrys</a>, le <strong>Toulouse HackerSpace Factory</strong> se tient désormais dans un autre lieu où l'utopie nécessaire est inscrite programme.</p>
|
||||
<p>Après avoir été soutenu et accueilli pendant 10 ans par <a href="https://vive.mixart-myrys.org/" target="_new">Mix'Art Myrys</a>, le <strong>Toulouse HackerSpace Factory</strong> se tient désormais dans un autre lieu où l'utopie nécessaire est inscrite au programme.</p>
|
||||
|
||||
<p>Cette année nous mettons en avant des réflexions sur <a href="https://fr.wikipedia.org/wiki/Extractivisme" target="_new">l'extractivisme des ressources</a> planétaires, des données, de la valeur travail.</p>
|
||||
<p>Cette année nous mettons en avant des réflexions sur <a href="https://fr.wikipedia.org/wiki/Extractivisme" target="_new">l'extractivisme des ressources</a> planétaires, des données et du produit du travail.</p>
|
||||
|
||||
<p>Comme toujours, notre objectif est de créer un festival qui poétise les bifurcations de nos idées communes et qui réinvente le sens de certains schémas imposés par notre époque. Rejoignez-nous pour une expérience enrichissante et pleine de surprises !</p>
|
||||
|
||||
<p>Consulter <a href="/planning">le programme du THSF</a>.</p>
|
||||
<p>Retrouvez <a href="/planning">le programme du THSF</a> avec ses <a href="/workshops">ateliers</a>, ses <a href="/exhibitions">expositions et installations</a> mais également ses <a href="/concerts">concerts</a>, ses <a href="/projections">projections</a>, ses <a href="/talks">présentations</a> et ses <a href="/discussions">tables rondes</a>.</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
34
src/thsf/templates/place.html
Normal file
34
src/thsf/templates/place.html
Normal file
@@ -0,0 +1,34 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<div class="logo_wrapper">
|
||||
<img class="logo"
|
||||
src="{{ url_for('static', filename='images/logo.svg') }}"
|
||||
alt="THSF 2023 - S/Extraire"
|
||||
title="THSF 2023 - S/Extraire"
|
||||
onclick="document.getElementById('wemakeporn').style.visibility='visible';">
|
||||
<div id="wemakeporn" class="wemakeporn"
|
||||
onclick="document.getElementById('wemakeporn').style.visibility='hidden';">
|
||||
<div class="wemake">WE MAKE</div>
|
||||
<div class="porn">PORN</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content">
|
||||
<h2>Toujours plus d'utopies</h2>
|
||||
<p>
|
||||
La fermeture administrative imposée à <a href="https://vive.mixart-myrys.org/" target="_new">Mix'Art Myrys</a>, terre d'accueil des 10 éditions antérieures du THSF, nous montre qu'il est plus que jamais important de continuer à bâtir, consolider et faire vivre nos utopies face à la repression systémique qu'on voudrait nous imposer.
|
||||
</p>
|
||||
<p>
|
||||
Connu pour sa programmation alternative et engagée, ainsi que pour son ambiance conviviale et chaleureuse, le cinéma d'art et d'essai indépendant <a href="https://www.cinemas-utopia.org/toulouse/">Utopia Borderouge</a>, dont l'utopie est naturellement au programme, s'est proposé pour accueillir le <strong>THSF 2023</strong>.
|
||||
</p>
|
||||
<h3>Plan d'accès</h3>
|
||||
<ul>
|
||||
<li><strong>Adresse:</strong> 59, avenue Maurice Bourgès-Maunoury, Les Izards - Toulouse</li>
|
||||
<li><strong>GPS:</strong> 43°38'22.7"N 1°27'07.3"E</li>
|
||||
<li><strong>Métro:</strong> Ligne B - Borderouge</li>
|
||||
<li><strong>Velooz:</strong> Station 175 - Métro Borderouge - Maunoury</li>
|
||||
</ul>
|
||||
<div class="map">
|
||||
<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://www.openstreetmap.org/export/embed.html?bbox=1.4502596855163576%2C43.63879667815726%2C1.4538002014160158%2C43.64046408342326&layer=mapnik&marker=43.639631357124614%2C1.4520299434661865" style="border: 1px solid black"></iframe><br/><small><a href="https://www.openstreetmap.org/?mlat=43.63963&mlon=1.45203#map=19/43.63963/1.45203">Afficher une carte plus grande</a></small>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -6,6 +6,7 @@
|
||||
<span class="title">{{slot.title}}</span>
|
||||
</div>
|
||||
<div class="slot_info">
|
||||
{% if slot.slot.room.fr != "Workshops" %}
|
||||
<div class="start">
|
||||
<i class="fa-solid fa-caret-right"></i>
|
||||
{{slot.slot.start | date2dmyhm}} - {{slot.duration}} minutes ({{slot.content_locale | capitalize}})
|
||||
@@ -14,6 +15,7 @@
|
||||
<i class="fa-solid fa-caret-right"></i>
|
||||
{{slot.slot.room.fr}}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="speakers">
|
||||
{% for speaker in slot.speakers %}
|
||||
<div class="speaker">
|
||||
@@ -33,9 +35,7 @@
|
||||
{% endif %}
|
||||
{% if speaker.biography %}
|
||||
<div class="speaker_biography">
|
||||
<div class="speaker_biography">
|
||||
{{ speaker.biography }}
|
||||
</div>
|
||||
{{ speaker.biography | safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -52,10 +52,10 @@
|
||||
title="{{slot.name}}">
|
||||
{% endif %}
|
||||
{% if slot.abstract %}
|
||||
<p>{{slot.abstract}}</p>
|
||||
<p>{{slot.abstract | safe }}</p>
|
||||
{% endif %}
|
||||
{% if slot.description %}
|
||||
<p>{{slot.description}}</p>
|
||||
<p>{{slot.description | safe }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
15
thsf.Dockerfile
Normal file
15
thsf.Dockerfile
Normal file
@@ -0,0 +1,15 @@
|
||||
ARG PRETALX_HOSTS_ENTRY
|
||||
FROM python:3.9.16-bullseye as thsf_base
|
||||
RUN apt-get update -y && \
|
||||
apt-get install -y bash make python3-pip && \
|
||||
useradd -m -d /home/thsf -s /bin/bash thsf
|
||||
|
||||
from thsf_base as thsf_build
|
||||
COPY . /home/thsf/
|
||||
RUN chown -R thsf:thsf /home/thsf/
|
||||
USER thsf
|
||||
WORKDIR /home/thsf/
|
||||
|
||||
from thsf_build
|
||||
RUN make install
|
||||
CMD ["make", "run"]
|
||||
8
thsf.net.code-workspace
Normal file
8
thsf.net.code-workspace
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "."
|
||||
}
|
||||
],
|
||||
"settings": {}
|
||||
}
|
||||
Reference in New Issue
Block a user