18 Commits

Author SHA1 Message Date
29a9a51543 import .drone.yml from master
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 16:51:17 +02:00
e6642eaeaa change source for pelican
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 16:27:51 +02:00
8674186937 fix: variable substition
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:25:59 +02:00
61bf2af24c fix: variable...
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:25:03 +02:00
ae080680ad Fix: variable syntax
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:22:14 +02:00
b87388939f feat: drone for 2022-2023 branch
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:20:06 +02:00
340f10a023 Fix: change source-link base url 2023-04-15 05:57:15 +02:00
435c787b2e Fix: pelicanconf import
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 14:44:55 +02:00
cb9820afa5 Fix: add __init__.py
Some checks failed
continuous-integration/drone/push Build is failing
2023-04-14 14:43:10 +02:00
5f7dea074e Fix: formating
Some checks failed
continuous-integration/drone/push Build is failing
2023-04-14 14:41:25 +02:00
0194eb763e Fix: years 2023-04-14 14:40:51 +02:00
0d4e4d74b0 Feat(core): update .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 14:29:07 +02:00
1ae89f63d0 Feat(plugin): enable source-link plugin 2023-04-14 14:26:11 +02:00
d90ed8149d Feat(plugin): add link to sources in template 2023-04-14 14:25:52 +02:00
dab40dddd0 Fix: " et ' 2023-04-14 13:57:39 +02:00
9a2d687434 Feat(core): add css build command 2023-04-14 13:56:58 +02:00
7ea7fba87c Feat(plugin): add source-link plugin 2023-04-14 13:56:29 +02:00
ae45ff7d42 Feat: add pre-commit config 2023-04-14 13:56:14 +02:00
13 changed files with 229 additions and 26 deletions

View File

@@ -1,30 +1,101 @@
---
kind: pipeline kind: pipeline
name: Opytex 2021-2022 name: Opytex Main
type: docker type: docker
trigger: trigger:
branch: branch:
- 2021-2022 - master
steps: steps:
- name: Deploy - name: Build Opytex base
image: python:3.8-alpine image: python:3.8-alpine
volumes:
- name: pelican-output
path: /output
commands: commands:
- apk add --no-cache openssh-client ca-certificates bash rsync git imagemagick-dev imagemagick - apk add --no-cache git imagemagick-dev imagemagick
- git submodule init - git submodule init
- git submodule update - git submodule update
- git clone https://git.opytex.org/lafrite/2021-2022.git content
- pip install --no-cache-dir -r requirements.txt - pip install --no-cache-dir -r requirements.txt
- export MAGICK_HOME=/usr - export MAGICK_HOME=/usr
- pelican ./content/ -o output -s publishconf.py --relative-urls - pelican ./content/ -o /output -s publishconf.py --relative-urls
- eval `ssh-agent -s` - ls /output
- echo "$SSH_KEY" | ssh-add -
- mkdir -p ~/.ssh - name: Push to bucket opytex.org
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config image: plugins/s3
- ssh sshcontent@91.121.90.228 'mkdir -p ~/opytex.org/www/enseignements/2021-2022/' volumes:
- rsync -rv --delete -e "ssh -p 22" ./output/ sshcontent@91.121.90.228:~/opytex.org/www/enseignements/2021-2022/ --checksum - name: pelican-output
environment: path: /output
SSH_KEY: settings:
from_secret: sshcontent-key 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: {}

15
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,15 @@
---
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 22.6.0
hooks:
- id: black

View File

@@ -49,8 +49,10 @@ help:
@echo 'Set the RELATIVE variable to 1 to enable relative urls ' @echo 'Set the RELATIVE variable to 1 to enable relative urls '
@echo ' ' @echo ' '
html: css:
lessc $(BASEDIR)/theme/static/stylesheet/style.less $(BASEDIR)/theme/static/stylesheet/style.min.css -x lessc $(BASEDIR)/theme/static/stylesheet/style.less $(BASEDIR)/theme/static/stylesheet/style.min.css -x
html: css
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
clean: clean:

0
__init__.py Normal file
View File

View File

@@ -44,6 +44,7 @@ PLUGINS = [
"tag_cloud", "tag_cloud",
"pdf-img", "pdf-img",
"big-button", "big-button",
"source-link",
] ]
ALWAYS_MODIFIED = True ALWAYS_MODIFIED = True
@@ -90,3 +91,7 @@ CATEGORY_FEED_ATOM = None
TRANSLATION_FEED_ATOM = None TRANSLATION_FEED_ATOM = None
AUTHOR_FEED_ATOM = None AUTHOR_FEED_ATOM = None
AUTHOR_FEED_RSS = None AUTHOR_FEED_RSS = None
# SOURCE LINK
GIT_SOURCE_BASE_URL = "https://git.opytex.org/spazz/2022-2023/src/branch/main"
SOURCE_ICON_URL = "https://git.opytex.org/assets/img/logo.svg"

View File

@@ -5,16 +5,18 @@ If "modified" date/time is not defined in article metadata, fall back to the "cr
from pelican import signals from pelican import signals
from pelican.contents import Content, Article from pelican.contents import Content, Article
def add_modified(content): def add_modified(content):
if not isinstance(content, Article): if not isinstance(content, Article):
return return
if not content.settings.get('ALWAYS_MODIFIED', False): if not content.settings.get("ALWAYS_MODIFIED", False):
return return
if hasattr(content, 'date') and not hasattr(content, 'modified'): if hasattr(content, "date") and not hasattr(content, "modified"):
content.modified = content.date content.modified = content.date
content.locale_modified = content.locale_date content.locale_modified = content.locale_date
def register(): def register():
signals.content_object_init.connect(add_modified) signals.content_object_init.connect(add_modified)

View File

@@ -0,0 +1,31 @@
# Pelican source link plugin
This plugin for [Pelican](https://github.com/getpelican/pelican/) generate two attributes for articles:
- `source_link`: link to the source of the article from your forge
- `path_source_link`: link to the path of the article from your forge
## Installation
Then, add the plugin to your pelicanconf.py file:
```python
PLUGINS = [
# other plugins...
"source_link",
]
```
## Usage
To use the plugin, define a constant named `GIT_SOURCE` in your pelicanconf.py file:
```python
GIT_SOURCE_BASE_URLL = "https://github.com/your-username/your-repo"
```
This constant should contain the base URL of your Git repository where your source code is stored.
Once the constant is defined, the plugin will generate a `source_link` and a `path_source_link` attributes for each article in your Pelican project.
Those links are generated based on the article's source path relative to the root directory of your Pelican project. If the constant PATH is defined in pelicanconf.py, the plugin will use this value as the root directory. Otherwise, it will use the default value of "", which assumes that your Pelican project is located in the same directory as your pelicanconf.py file.

View File

@@ -0,0 +1 @@
from .source_link import *

View File

@@ -0,0 +1,37 @@
from pelican import signals
import logging
import os
logger = logging.getLogger(__name__)
from pelican.settings import DEFAULT_CONFIG
def set_default_settings(settings):
settings.setdefault("GIT_SOURCE_BASE_URL", None)
def init_default_config(pelican):
set_default_settings(DEFAULT_CONFIG)
if pelican:
set_default_settings(pelican.settings)
def source_link_generator(article_generator):
git_source = article_generator.settings.get(
"GIT_SOURCE_BASE_URL", DEFAULT_CONFIG["GIT_SOURCE_BASE_URL"]
)
root_path = article_generator.settings.get("PATH", DEFAULT_CONFIG.get("PATH", ""))
for article in article_generator.articles:
article_path = os.path.abspath(os.path.join(root_path, article.source_path))
relative_path = os.path.relpath(article_path, root_path)
if git_source.endswith("/"):
article.source_link = f"{git_source}{relative_path}"
else:
article.source_link = f"{git_source}/{relative_path}"
article.path_source_link = "/".join(article.source_link.split("/")[:-1])
def register():
signals.initialized.connect(init_default_config)
signals.article_generator_finalized.connect(source_link_generator)

View File

@@ -7,19 +7,21 @@ from __future__ import unicode_literals
import os import os
import sys import sys
sys.path.append(os.curdir) sys.path.append(os.curdir)
from pelicanconf import * from pelicanconf import *
# If your site is available via HTTPS, make sure SITEURL begins with https:// # If your site is available via HTTPS, make sure SITEURL begins with https://
SITEURL = 'https://opytex.org/enseignements/2022-2023/' SITEURL = "https://opytex.org/enseignements/2022-2023/"
RELATIVE_URLS = False RELATIVE_URLS = False
FEED_ALL_ATOM = 'feeds/all.atom.xml' FEED_ALL_ATOM = "feeds/all.atom.xml"
CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml' CATEGORY_FEED_ATOM = "feeds/{slug}.atom.xml"
DELETE_OUTPUT_DIRECTORY = True DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing # Following items are often useful when publishing
#DISQUS_SITENAME = "" # DISQUS_SITENAME = ""
#GOOGLE_ANALYTICS = "" # GOOGLE_ANALYTICS = ""

View File

@@ -350,6 +350,33 @@ main {
padding-top: 1em; padding-top: 1em;
} }
.source {
text-align: center;
padding-top: 1em;
img {
border: 0;
box-shadow: none;
}
a {
background-color: @tag-bg;
padding: .2em .6em .2em;
font-size: .74em;
line-height: 1;
color: @tag-text-color;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em;
}
a:hover {
background-color: @tag-hover-color;
}
}
.tag-cloud { .tag-cloud {
text-align: center; text-align: center;
a { a {

File diff suppressed because one or more lines are too long

View File

@@ -48,6 +48,16 @@
mod=article.locale_modified, mod=article.locale_modified,
category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }} category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
</div> </div>
{% if 'GIT_SOURCE_BASE_URL' %}
<div class="source">
<a href="{{ article.path_source_link}}">
<img src={{ SOURCE_ICON_URL }} alt="source icon" ario>
source et documents
</a>
</div>
{% endif %}
<div class="tag-cloud"> <div class="tag-cloud">
<p> <p>
{% if 'post_stats' in PLUGINS %} {% if 'post_stats' in PLUGINS %}