Commit 3bcf4319 authored by Matthieu Boileau's avatar Matthieu Boileau

Update requirements.txt

urllib3 must be <1.25 for package attrs
parent 04ca55dc
......@@ -5,6 +5,6 @@ timeout = 10
[irma]
url = https://gitlab.math.unistra.fr
PRIVATE_TOKEN = FByQxzgdXbgJC5Pis_s7
PRIVATE_TOKEN = { SECRET_TOKEN }
api_version = 4
......@@ -467,15 +467,25 @@ def create_job_request(job_offer, debug):
"""
# Connecting to Gitlab
try:
# TODO: remove GITLAB_TOKEN variable from gitlab_config.py, revoke token and use the line below
# instead of os.gentenv()
# gitlab_private_token = os.environ['GITLAB_PRIVATE_TOKEN']
gitlab_private_token = os.getenv('GITLAB_PRIVATE_TOKEN', GITLAB_TOKEN)
except KeyError:
print("GITLAB_PRIVATE_TOKEN environment variable not set!")
sys.exit(1)
if debug.verbose:
print('[DEBUG] Gitlab connection to {} '.format(GITLAB_URL) +
'with token {}'.format(GITLAB_TOKEN), file=sys.stderr)
'with token {}'.format(gitlab_private_token), file=sys.stderr)
if not debug.offline:
import gitlab
gl = gitlab.Gitlab(
GITLAB_URL,
private_token=GITLAB_TOKEN,
private_token=gitlab_private_token,
api_version=4
)
......
# Gitlab configuration
GITLAB_URL = "https://gitlab.math.unistra.fr"
GITLAB_TOKEN = "oH9EHD7FU4A8sPHgdoDP"
GITLAB_TOKEN = "gswFMV-Tvtzm1LZJyPgk"
GITLAB_TARGET_ID = 309 # groupe-calcul/website
GITLAB_TARGET_BRANCH = 'develop'
GITLAB_SOURCE_ID = 309 # groupe-calcul/website
......
Logotype du Groupe Calcul
#########################
Logo du Groupe Calcul
#####################
:date: 2019-05-10
:modified: 2019-05-10
......@@ -10,14 +10,6 @@ Logotype du Groupe Calcul
.. section:: Versions téléchargeables
:class: description
.. figure:: ../attachments/logo/Logo_fonc_txt.png
:width: 100 px
:align: center
:target: ../attachments/logo/Logo_.psd
:alt: logo groupe Calcul PSD
Fichier source au format PSD.
.. figure:: ../attachments/logo/Logo_small_fonc_txt.png
:width: 100 px
:align: center
......
......@@ -26,18 +26,30 @@ Mentions légales
:class: description
- Adresse de contact : `calcul-contact@math.cnrs.fr <calcul-contact@math.cnrs.fr>`_
- Hébergement web : GDS `Mathrice <https://www.mathrice.fr>`_
- Hébergement web : GDS Mathrice_
- Hébergement des sources : `projet gitlab <https://gitlab.math.unistra.fr/groupe-calcul/website>`_ sur l'instance
de l'IRMA_.
.. section:: Crédits
:class: description
.. section:: Création du site
:class: orga
Graphisme : `Pierre Digonnet`_
- Matthieu Boileau
- Roland Denis
- `Pierre Digonnet`_ (Graphisme)
- Benoît Fabrèges
- Loïc Gouarin
- Matthieu Haefele
- Pierre Navaro
- Fabrice Roy
.. section:: Contenus
:class: description
Les sources de ce site web sont hébergées sur ce
`projet gitlab <https://gitlab.math.unistra.fr/groupe-calcul/website>`_.
Sauf mention contraire, la réutilisation des contenus de calcul.math.cnrs.fr est soumise aux règles précisées
ci-dessous.
......
......@@ -12,6 +12,7 @@
.. _IDRIS: http://www.idris.fr
.. _INSMI: https://www.cnrs.fr/insmi
.. _Inria: https://www.inria.fr
.. _IRMA: https://irma.math.unistra.fr
.. _Mathrice: https://www.mathrice.fr
.. _GdR IM: https://www.gdr-im.fr
.. _GdR Madics: http://www.madics.fr
......@@ -26,3 +27,4 @@
.. _Pierre Digonnet: http://pierredigonnet.com
.. _CC-BY-NC-ND-2.0-FR: https://creativecommons.org/licenses/by-nc-nd/2.0/fr
.. _CC-BY-4.0-FR: https://creativecommons.org/licenses/by/4.0/deed.fr
......@@ -654,8 +654,11 @@ a.download {
}
.greybgfig img {
background-color: gray;
background-image: repeating-linear-gradient(45deg, transparent, transparent 35px, rgba(255,255,255,.5) 35px, rgba(255,255,255,.5) 70px);
background-color: #666;
background-image: linear-gradient(45deg, #aaa 25%, transparent 25%, transparent 75%, #aaa 75%),
linear-gradient(45deg, #aaa 25%, transparent 25%, transparent 75%, #aaa 75%);
background-size: 50px 50px;
background-position: 0 0, 25px 25px;
}
/* Section title */
......
......@@ -58,18 +58,18 @@
<input type="text" name="title" value="{{ '{{form.title}}' }}" autofocus required>
<span class="error">{{ '{{errors.title}}' }}</span>
</p>
<p>
Nom du contact* <br>
<input type="text" name="author" value="{{ '{{form.author}}' }}" required>
<span class="error">{{ '{{errors.author}}' }}</span>
</p>
<p>
Employeur* <br>
<input type="text" name="employer" value="{{ '{{form.employer}}' }}" required>
<span class="error">{{ '{{errors.employer}}' }}</span>
</p>
<p>
E-mail* <br>
Nom du contact* <br>
<input type="text" name="author" value="{{ '{{form.author}}' }}" required>
<span class="error">{{ '{{errors.author}}' }}</span>
</p>
<p>
E-mail du contact* <br>
<input type="email" name="email" value="{{ '{{form.email}}' }}" required>
<span class="error">{{ '{{errors.email}}' }}</span>
</p>
......
......@@ -15,15 +15,21 @@ from pelican.utils import slugify
GITLAB_PROJECT_ID = 309 # Project id that holds the target issue
GITLAB_ISSUE_ID = 49 # Target issue id
CONFIG_FILE = ".python-gitlab.cfg"
GITLAB_URL = 'https://gitlab.math.unistra.fr'
TOCLEAN_DIR = "content_not_clean_yet"
CLEANED_DIR = "content"
def connect_to_gitlab(gitlab_id=None):
def connect_to_gitlab(gitlab_url=GITLAB_URL):
"""Return a connection to GitLab API"""
try:
gl = gitlab.Gitlab.from_config(gitlab_id, config_files=CONFIG_FILE)
gitlab_private_token = os.environ['GITLAB_PRIVATE_TOKEN']
except KeyError:
print("GITLAB_PRIVATE_TOKEN environment variable not set!")
sys.exit(1)
try:
gl = gitlab.Gitlab(gitlab_url, private_token=gitlab_private_token)
except (gitlab.config.GitlabIDError, gitlab.config.GitlabDataError) as e:
print("Exception in python-gitlab: {}.\n".format(e),
"Check python-gitlab configuration on",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment