Feat: start using invoke

.drone.yml

@@ -1,101 +0,0 @@
----
-kind: pipeline
-name: Opytex Main
-type: docker
-
-trigger:
-  branch:
-    - master
-
-steps:
-  - name: Build Opytex base
-    image: python:3.8-alpine
-    volumes:
-      - name: pelican-output
-        path: /output
-    commands:
-      - apk add --no-cache git imagemagick-dev imagemagick
-      - git submodule init
-      - git submodule update
-      - pip install --no-cache-dir -r requirements.txt
-      - export MAGICK_HOME=/usr
-      - pelican ./content/ -o /output -s publishconf.py --relative-urls
-      - ls /output
-
-  - name: Push to bucket opytex.org
-    image: plugins/s3
-    volumes:
-      - name: pelican-output
-        path: /output
-    settings:
-      bucket: opytex.org
-      endpoint: https://storage.opytex.org
-      access_key:
-        from_secret: minio_access_key
-      secret_key:
-        from_secret: minio_secret_key
-      source: /output/**/*
-      target: /
-      path_style: true
-      strip_prefix: /output
-
-
-volumes:
-  - name: pelican-output
-    temp: {}
-
----
-kind: pipeline
-name: Opytex Year
-type: docker
-
-trigger:
-  branch:
-    - 2022-2023
-    - 2021-2022
-    - 2020-2021
-    - 2019-2020
-    - 2018-2019
-    - 2017-2018
-    - 2016-2017
-    - 2015-2016
-
-steps:
-  - name: Build Opytex ${DRONE_BRANCH}
-    image: python:3.8-alpine
-    volumes:
-      - name: pelican-output
-        path: /output
-    commands:
-      - apk add --no-cache git imagemagick-dev imagemagick
-      - git submodule init
-      - git submodule update
-      - git clone https://git.opytex.org/lafrite/${DRONE_BRANCH}.git content
-      - pip install --no-cache-dir -r requirements.txt
-      - apk add --no-cache git imagemagick-dev imagemagick
-      - pip install --no-cache-dir -r requirements.txt
-      - export MAGICK_HOME=/usr
-      - pelican ./content/ -o /output -s publishconf.py --relative-urls
-      - ls /output
-
-  - name: Push to bucket opytex.org
-    image: plugins/s3-sync:1
-    volumes:
-      - name: pelican-output
-        path: /drone/src/output
-    settings:
-      bucket: opytex.org
-      endpoint: https://storage.opytex.org
-      access_key:
-        from_secret: minio_access_key
-      secret_key:
-        from_secret: minio_secret_key
-      source: /output
-      target: /enseignements/${DRONE_BRANCH}
-      path_style: true
-      delete: true
-
-
-volumes:
-  - name: pelican-output
-    temp: {}

.gitignore

@@ -6,4 +6,3 @@ content
 __pycache__
 *.pid
 venv/
-.vim/

Makefile

@@ -2,7 +2,7 @@ PY?=python3
 PELICAN?=pelican
 PELICANOPTS=
 
-YEARSUBFOLDER=enseignements/2018-2019/
+YEARSUBFOLDER=enseignements/2019-2020/
 
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content

globalconf.py

@@ -10,8 +10,9 @@ MENUITEMS = [
         #("Dernières modifications", SITEURL+"blog_index.html"),
         ("Accueil", "/"),
         ("Contenus de cours", "/pages/tout-sur-mes-cours.html"),
-        ('Blog', '/blog_index.html'),
+        ('blog', '/blog_index.html'),
-        ('Informatique', "/pages/projets-informatiques.html"),
+        ('Opytex', "/opytex/"),
+        ("pyMath", "/pymath/"),
         ('À propos', "/pages/a-propos.html"),
         ]
 

pelicanconf.py

@@ -9,7 +9,7 @@ from globalconf import *
 AUTHOR = 'Benjamin Bertrand'
 SITENAME = 'OpyTex'
 SITETITLE = 'OpyTex'
-SITESUBTITLE = "2018-2019"
+SITESUBTITLE = "2019-2020"
 SITEURL = ''
 
 CC_LICENSE_COMMERCIAL = True

requirements.txt

@@ -1,15 +1,11 @@
-beautifulsoup4==4.9.1
 blinker==1.4
-bs4==0.0.1
+docutils==0.13.1
-docutils==0.16
+feedgenerator==1.9
-feedgenerator==1.9.1
+Jinja2==2.9.6
-Jinja2==2.11.2
+MarkupSafe==1.0
-MarkupSafe==1.1.1
+pelican==3.7.1
-pelican==4.2.0
+Pygments==2.2.0
-Pygments==2.6.1
+python-dateutil==2.6.0
-python-dateutil==2.8.1
+pytz==2017.2
-pytz==2020.1
+six==1.10.0
-six==1.15.0
+Unidecode==0.4.20
-soupsieve==2.0.1
-Unidecode==1.1.1
-Wand==0.6.1

tasks.py

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+import sys
+import datetime
+
+from invoke import task
+from invoke.util import cd
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
+from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
+
+SETTINGS_FILE_BASE = 'pelicanconf.py'
+SETTINGS = {}
+SETTINGS.update(DEFAULT_CONFIG)
+LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
+SETTINGS.update(LOCAL_SETTINGS)
+
+CONFIG = {
+    'current_path': os.getcwd(),
+    'settings_base': SETTINGS_FILE_BASE,
+    'settings_publish': 'publishconf.py',
+
+    'year_subfolder': 'enseignements/2019-2020/',
+
+    # Output path. Can be absolute or relative to tasks.py. Default: 'output'
+    'deploy_path': SETTINGS['OUTPUT_PATH'],
+
+    'fake_path': '../../output/',
+
+    # Remote server configuration
+    'ssh_user': 'sshcontent',
+    'ssh_host': 'Embrevade',
+    'ssh_port': '22',
+    'ssh_path': '/home/sshcontent/opytex.org/www/',
+
+    # Rsync config
+    'rsync_exclude': '',
+
+    # Port for `serve`
+    'port': 8000,
+}
+
+@task
+def clean(c):
+    """Remove generated files"""
+    if os.path.isdir(CONFIG['deploy_path']):
+        shutil.rmtree(CONFIG['deploy_path'])
+        os.makedirs(CONFIG['deploy_path'])
+
+@task
+def build(c):
+    """Build local version of site"""
+    c.run('lessc {current_path}/theme/static/stylesheet/style.less {current_path}/theme/static/stylesheet/style.min.css -x'.format(**CONFIG))
+    c.run('pelican -s {settings_base}'.format(**CONFIG))
+
+@task
+def rebuild(c):
+    """`build` with the delete switch"""
+    c.run('pelican -d -s {settings_base}'.format(**CONFIG))
+
+@task
+def regenerate(c):
+    """Automatically regenerate site upon file modification"""
+    c.run('pelican -r -s {settings_base}'.format(**CONFIG))
+
+@task
+def serve(c):
+    """Serve site at http://localhost:$PORT/ (default port is 8000)"""
+
+    class AddressReuseTCPServer(RootedHTTPServer):
+        allow_reuse_address = True
+
+    server = AddressReuseTCPServer(
+        CONFIG['deploy_path'],
+        ('', CONFIG['port']),
+        ComplexHTTPRequestHandler)
+
+    sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG))
+    server.serve_forever()
+
+@task
+def reserve(c):
+    """`build`, then `serve`"""
+    build(c)
+    serve(c)
+
+@task
+def preview(c):
+    """Build production version of site"""
+    c.run('pelican -s {settings_publish}'.format(**CONFIG))
+
+@task
+def livereload(c):
+    """Automatically reload browser tab upon file modification."""
+    from livereload import Server
+    build(c)
+    server = Server()
+    # Watch the base settings file
+    server.watch(CONFIG['settings_base'], lambda: build(c))
+    # Watch content source files
+    content_file_extensions = ['.md', '.rst']
+    for extension in content_file_extensions:
+        content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
+        server.watch(content_blob, lambda: build(c))
+    # Watch the theme's templates and static assets
+    theme_path = SETTINGS['THEME']
+    server.watch('{}/templates/*.html'.format(theme_path), lambda: build(c))
+    static_file_extensions = ['.css', '.js']
+    for extension in static_file_extensions:
+        static_file = '{0}/static/**/*{1}'.format(theme_path, extension)
+        server.watch(static_file, lambda: build(c))
+    # Serve output path on configured port
+    server.serve(port=CONFIG['port'], root=CONFIG['deploy_path'])
+
+
+@task
+def publish(c):
+    """Publish to production via rsync"""
+    c.run('pelican -s {settings_publish}'.format(**CONFIG))
+    c.run(
+        'rsync --delete {rsync_exclude} -pthrvz -c '
+        '-e "ssh " '
+        '{} {ssh_host}:{ssh_path}'.format(
+            CONFIG['deploy_path'].rstrip('/') + '/',
+            **CONFIG))
+
+@task(
+        pre=[build]
+        )
+def fake(c):
+    """ Mimic a push to server """
+    print('{fake_path}{year_subfolder}'.format(**CONFIG))
+    os.makedirs('{fake_path}{year_subfolder}'.format(**CONFIG), exist_ok=True)
+    c.run('rsync -P -rvzc --delete {rsync_exclude} {deploy_path}/ {fake_path}{year_subfolder} --cvs-exclude'.format(**CONFIG))
+

theme/templates/base.html

@@ -173,6 +173,5 @@
   {% if GITHUB_CORNER_URL %}
   {% include 'partial/github.html' %}
   {% endif %}
-  <script type="text/javascript" async defer data-website-id="2cb9cd4c-66da-4e4f-9e84-a2d53c7b07bc" src="https://stat.opytex.org/umami.js"></script>
 </body>
 </html>