grewn0uille/afpy.org
1
0
Fork 0
forked from AFPy/afpy.org
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add isort flake8 and black configuration and tooling.

Browse Source
This commit is contained in:
Rémy HUBSCHER 2019-08-26 16:06:35 +02:00
parent 141c2f2ce3
commit ea05506aa2
No known key found for this signature in database
GPG Key ID: 82B47F36036A312A
6 changed files with 137 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.flake8 Normal file
View File

@ -0,0 +1,2 @@
[flake8]
max-line-length = 88

10
.isort.cfg Normal file
View File

@ -0,0 +1,10 @@
[settings]
# Needed for black compatibility
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
line_length=88
combine_as_imports=True
# If set, imports will be sorted within their section independent to the import_type.
force_sort_within_sections=True

8
Makefile
View File

@ -2,6 +2,8 @@ VENV = $(PWD)/.env
PIP = $(VENV)/bin/pip
PYTHON = $(VENV)/bin/python
FLASK = $(VENV)/bin/flask
ISORT = $(VENV)/bin/isort
BLACK = $(VENV)/bin/black
AFPY_SERVER = afpy_web
all: install serve
@ -27,3 +29,9 @@ serve:
afpy:
ssh -t $(AFPY_SERVER) 'cd site && git pull'
ssh -t $(AFPY_SERVER) 'killall uwsgi-3.6 && /usr/local/etc/rc.d/uwsgi restart'
isort:
$(ISORT) -rc .isort.cfg afpy.py tests.py
black:
$(VENV)/bin/black afpy.py tests.py

226
afpy.py
View File

@ -3,22 +3,30 @@ import locale
import os
import time
from dateutil.parser import parse
import docutils.core
import docutils.writers.html5_polyglot
import feedparser
from dateutil.parser import parse
from flask import (Flask, abort, jsonify, redirect, render_template, request,
send_from_directory, url_for)
from flask import (
Flask,
abort,
jsonify,
redirect,
render_template,
request,
send_from_directory,
url_for,
)
from flask_caching import Cache
from itsdangerous import BadSignature, URLSafeSerializer
from jinja2 import TemplateNotFound
import data_xml as data
locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
locale.setlocale(locale.LC_ALL, "fr_FR.UTF-8")
cache = Cache(config={'CACHE_TYPE': 'simple', 'CACHE_DEFAULT_TIMEOUT': 600})
signer = URLSafeSerializer(os.environ.get('SECRET', 'changeme!'))
cache = Cache(config={"CACHE_TYPE": "simple", "CACHE_DEFAULT_TIMEOUT": 600})
signer = URLSafeSerializer(os.environ.get("SECRET", "changeme!"))
app = Flask(__name__)
cache.init_app(app)
@ -26,77 +34,70 @@ cache.init_app(app)
PAGINATION = 12
PLANET = {
'Emplois AFPy': 'https://www.afpy.org/feed/emplois/rss.xml',
'Nouvelles AFPy': 'https://www.afpy.org/feed/actualites/rss.xml',
'Anybox': 'https://anybox.fr/site-feed/RSS?set_language=fr',
'Ascendances': 'https://ascendances.wordpress.com/feed/',
'Code en Seine': 'https://codeenseine.fr/feeds/all.atom.xml',
'Yaal': 'https://www.yaal.fr/blog/feeds/all.atom.xml',
"Emplois AFPy": "https://www.afpy.org/feed/emplois/rss.xml",
"Nouvelles AFPy": "https://www.afpy.org/feed/actualites/rss.xml",
"Anybox": "https://anybox.fr/site-feed/RSS?set_language=fr",
"Ascendances": "https://ascendances.wordpress.com/feed/",
"Code en Seine": "https://codeenseine.fr/feeds/all.atom.xml",
"Yaal": "https://www.yaal.fr/blog/feeds/all.atom.xml",
}
MEETUPS = {
'amiens': 'https://www.meetup.com/fr-FR/Python-Amiens',
'bruxelles': 'https://www.meetup.com/fr-FR/'
'Belgium-Python-Meetup-aka-AperoPythonBe/',
'grenoble': 'https://www.meetup.com/fr-FR/'
'Groupe-dutilisateurs-Python-Grenoble/',
'lille': 'https://www.meetup.com/fr-FR/Lille-py/',
'lyon': 'https://www.meetup.com/fr-FR/Python-AFPY-Lyon/',
'nantes': 'https://www.meetup.com/fr-FR/Nantes-Python-Meetup/',
'montpellier': 'https://www.meetup.com/fr-FR/Meetup-Python-Montpellier/',
"amiens": "https://www.meetup.com/fr-FR/Python-Amiens",
"bruxelles": "https://www.meetup.com/fr-FR/"
"Belgium-Python-Meetup-aka-AperoPythonBe/",
"grenoble": "https://www.meetup.com/fr-FR/" "Groupe-dutilisateurs-Python-Grenoble/",
"lille": "https://www.meetup.com/fr-FR/Lille-py/",
"lyon": "https://www.meetup.com/fr-FR/Python-AFPY-Lyon/",
"nantes": "https://www.meetup.com/fr-FR/Nantes-Python-Meetup/",
"montpellier": "https://www.meetup.com/fr-FR/Meetup-Python-Montpellier/",
}
@app.errorhandler(404)
def page_not_found(e):
return render_template('404.html'), 404
return render_template("404.html"), 404
@app.route('/')
@app.route("/")
def index():
posts = {}
for post in data.get_posts(data.POST_ACTUALITIES, end=4):
timestamp = post[data.TIMESTAMP]
posts[timestamp] = post
return render_template(
'index.html',
body_id='index',
name=data.POST_ACTUALITIES,
posts=posts
"index.html", body_id="index", name=data.POST_ACTUALITIES, posts=posts
)
@app.route('/<name>')
@app.route("/<name>")
def pages(name):
if name == 'index':
return redirect(url_for('index'))
if name == "index":
return redirect(url_for("index"))
try:
return render_template(f'{name}.html', body_id=name, meetups=MEETUPS)
return render_template(f"{name}.html", body_id=name, meetups=MEETUPS)
except TemplateNotFound:
abort(404)
@app.route('/docs/<name>')
@app.route("/docs/<name>")
def rest(name):
try:
with open(f'templates/{name}.rst') as fd:
with open(f"templates/{name}.rst") as fd:
parts = docutils.core.publish_parts(
source=fd.read(),
writer=docutils.writers.html5_polyglot.Writer(),
settings_overrides={'initial_header_level': 2},
settings_overrides={"initial_header_level": 2},
)
except FileNotFoundError:
abort(404)
return render_template(
'rst.html',
body_id=name,
html=parts['body'],
title=parts['title']
"rst.html", body_id=name, html=parts["body"], title=parts["title"]
)
@app.route('/post/edit/<name>')
@app.route('/post/edit/<name>/token/<token>')
@app.route("/post/edit/<name>")
@app.route("/post/edit/<name>/token/<token>")
def edit_post(name, token=None):
if name not in data.POSTS:
abort(404)
@ -111,17 +112,13 @@ def edit_post(name, token=None):
else:
post = {data.STATE: data.STATE_WAITING}
if post[data.STATE] == data.STATE_TRASHED:
return redirect(url_for('rest', name='already_trashed'))
return redirect(url_for("rest", name="already_trashed"))
return render_template(
'edit_post.html',
body_id='edit-post',
post=post,
name=name,
admin=False,
"edit_post.html", body_id="edit-post", post=post, name=name, admin=False
)
@app.route('/admin/post/edit/<name>/<timestamp>')
@app.route("/admin/post/edit/<name>/<timestamp>")
def edit_post_admin(name, timestamp):
if name not in data.POSTS:
abort(404)
@ -129,16 +126,12 @@ def edit_post_admin(name, timestamp):
if not post:
abort(404)
return render_template(
'edit_post.html',
body_id='edit-post',
post=post,
name=name,
admin=True
"edit_post.html", body_id="edit-post", post=post, name=name, admin=True
)
@app.route('/post/edit/<name>', methods=['post'])
@app.route('/post/edit/<name>/token/<token>', methods=['post'])
@app.route("/post/edit/<name>", methods=["post"])
@app.route("/post/edit/<name>/token/<token>", methods=["post"])
def save_post(name, token=None):
if name not in data.POSTS:
abort(404)
@ -151,57 +144,56 @@ def save_post(name, token=None):
timestamp = None
try:
post = data.save_post(
name, timestamp=timestamp, admin=False,
form=request.form, files=request.files
name,
timestamp=timestamp,
admin=False,
form=request.form,
files=request.files,
)
except data.DataException as e:
abort(e.http_code)
edit_post_url = url_for(
'edit_post', name=name, token=signer.dumps(post['_timestamp'])
"edit_post", name=name, token=signer.dumps(post["_timestamp"])
)
if post[data.STATE] == data.STATE_TRASHED:
return redirect(url_for('rest', name='already_trashed'))
return render_template(
'confirmation.html',
edit_post_url=edit_post_url
)
return redirect(url_for("rest", name="already_trashed"))
return render_template("confirmation.html", edit_post_url=edit_post_url)
@app.route('/admin/post/edit/<name>/<timestamp>', methods=['post'])
@app.route("/admin/post/edit/<name>/<timestamp>", methods=["post"])
def save_post_admin(name, timestamp):
if name not in data.POSTS:
abort(404)
try:
data.save_post(
name, timestamp=timestamp, admin=True,
form=request.form, files=request.files
name,
timestamp=timestamp,
admin=True,
form=request.form,
files=request.files,
)
except data.DataException as e:
abort(e.http_code)
if 'delete_image' in request.form:
if "delete_image" in request.form:
return redirect(request.url)
return redirect(url_for('admin', name=name))
return redirect(url_for("admin", name=name))
@app.route('/posts/<name>')
@app.route('/posts/<name>/page/<int:page>')
@app.route("/posts/<name>")
@app.route("/posts/<name>/page/<int:page>")
def posts(name, page=1):
if name not in data.POSTS:
abort(404)
end = page * PAGINATION
start = end - PAGINATION
total_pages = (
data.count_posts(name, data.STATE_PUBLISHED) // PAGINATION
) + 1
total_pages = (data.count_posts(name, data.STATE_PUBLISHED) // PAGINATION) + 1
posts = {}
for post in data.get_posts(
name, data.STATE_PUBLISHED, start=start, end=end
):
for post in data.get_posts(name, data.STATE_PUBLISHED, start=start, end=end):
timestamp = post[data.TIMESTAMP]
posts[timestamp] = post
return render_template(
'posts.html',
"posts.html",
body_id=name,
posts=posts,
title=data.POSTS[name],
@ -211,7 +203,7 @@ def posts(name, page=1):
)
@app.route('/admin/posts/<name>')
@app.route("/admin/posts/<name>")
def admin(name):
if name not in data.POSTS:
abort(404)
@ -222,34 +214,25 @@ def admin(name):
timestamp = post[data.TIMESTAMP]
state_posts[timestamp] = post
return render_template(
'admin.html',
body_id='admin',
posts=posts,
title=data.POSTS[name],
name=name,
"admin.html", body_id="admin", posts=posts, title=data.POSTS[name], name=name
)
@app.route('/posts/<name>/<timestamp>')
@app.route("/posts/<name>/<timestamp>")
def post(name, timestamp):
if name not in data.POSTS:
abort(404)
post = data.get_post(name, timestamp, data.STATE_PUBLISHED)
if not post:
abort(404)
return render_template(
'post.html',
body_id='post',
post=post,
name=name
)
return render_template("post.html", body_id="post", post=post, name=name)
@app.route('/post_image/<path:path>')
@app.route("/post_image/<path:path>")
def post_image(path):
if path.count('/') != 3:
if path.count("/") != 3:
abort(404)
category, state, timestamp, name = path.split('/')
category, state, timestamp, name = path.split("/")
if category not in data.POSTS:
abort(404)
if state not in data.STATES:
@ -257,60 +240,59 @@ def post_image(path):
return send_from_directory(data.root, path)
@app.route('/feed/<name>/rss.xml')
@app.route("/feed/<name>/rss.xml")
@cache.cached()
def feed(name):
if name not in data.POSTS:
abort(404)
entries = []
for post in data.get_posts(name, data.STATE_PUBLISHED, end=50):
post['timestamp'] = post[data.TIMESTAMP]
post['link'] = url_for(
'post', name=name, timestamp=post['timestamp'],
_external=True
post["timestamp"] = post[data.TIMESTAMP]
post["link"] = url_for(
"post", name=name, timestamp=post["timestamp"], _external=True
)
entries.append({'content': post})
title = f'{data.POSTS[name]} AFPy.org'
entries.append({"content": post})
title = f"{data.POSTS[name]} AFPy.org"
return render_template(
'rss.xml',
"rss.xml",
entries=entries,
title=title,
description=title,
link=url_for('feed', name=name, _external=True),
link=url_for("feed", name=name, _external=True),
)
@app.route('/planet/')
@app.route('/planet/rss.xml')
@app.route("/planet/")
@app.route("/planet/rss.xml")
@cache.cached()
def planet():
entries = []
for name, url in PLANET.items():
for entry in feedparser.parse(url).entries:
if hasattr(entry, 'updated_parsed'):
if hasattr(entry, "updated_parsed"):
date = entry.updated_parsed
elif hasattr(entry, 'published_parsed'):
elif hasattr(entry, "published_parsed"):
date = entry.published_parsed
else:
date = time.time()
entry['timestamp'] = time.mktime(date) if date else time.time()
entries.append({'feed': name, 'content': entry})
entries.sort(reverse=True, key=lambda entry: entry['content']['timestamp'])
entry["timestamp"] = time.mktime(date) if date else time.time()
entries.append({"feed": name, "content": entry})
entries.sort(reverse=True, key=lambda entry: entry["content"]["timestamp"])
return render_template(
'rss.xml',
"rss.xml",
entries=entries,
title='Planet Python francophone',
description='Nouvelles autour de Python en français',
link=url_for('planet', _external=True),
title="Planet Python francophone",
description="Nouvelles autour de Python en français",
link=url_for("planet", _external=True),
)
@app.route('/rss-jobs/RSS')
@app.route("/rss-jobs/RSS")
def jobs():
return redirect('https://plone.afpy.org/rss-jobs/RSS', code=307)
return redirect("https://plone.afpy.org/rss-jobs/RSS", code=307)
@app.route('/status')
@app.route("/status")
def status():
stats = {}
for category in data.POSTS:
@ -319,26 +301,26 @@ def status():
stats[category][state] = data.count_posts(category, state)
os_stats = os.statvfs(__file__)
stats['disk_free'] = os_stats.f_bavail * os_stats.f_frsize
stats['disk_total'] = os_stats.f_blocks * os_stats.f_frsize
stats['load_avg'] = os.getloadavg()
stats["disk_free"] = os_stats.f_bavail * os_stats.f_frsize
stats["disk_total"] = os_stats.f_blocks * os_stats.f_frsize
stats["load_avg"] = os.getloadavg()
return jsonify(stats)
@app.template_filter('rfc822_datetime')
@app.template_filter("rfc822_datetime")
def format_rfc822_datetime(timestamp):
return email.utils.formatdate(int(timestamp))
@app.template_filter('parse_iso_datetime')
@app.template_filter("parse_iso_datetime")
def parse_iso_datetime(iso_datetime, format_):
return parse(iso_datetime).strftime(format_)
if app.env == 'development': # pragma: no cover
if app.env == "development": # pragma: no cover
from sassutils.wsgi import SassMiddleware
app.wsgi_app = SassMiddleware(
app.wsgi_app, {'afpy': ('sass', 'static/css', '/static/css')}
app.wsgi_app, {"afpy": ("sass", "static/css", "/static/css")}
)

2
setup.py
View File

@ -5,6 +5,8 @@ tests_requirements = [
'pytest-cov',
'pytest-flake8',
'pytest-isort',
'black',
'isort',
]
setup(

22
tests.py
View File

@ -4,38 +4,38 @@ from afpy import app
def test_home():
response = app.test_client().get('/')
response = app.test_client().get("/")
assert response.status_code == 200
@pytest.mark.parametrize('name', ['', 'communaute'])
@pytest.mark.parametrize("name", ["", "communaute"])
def test_html(name):
response = app.test_client().get(f'/{name}')
response = app.test_client().get(f"/{name}")
assert response.status_code == 200
@pytest.mark.parametrize('name', ['charte', 'a-propos'])
@pytest.mark.parametrize("name", ["charte", "a-propos"])
def test_rest(name):
response = app.test_client().get(f'/docs/{name}')
response = app.test_client().get(f"/docs/{name}")
assert response.status_code == 200
def test_planet():
response = app.test_client().get(f'/planet/')
response = app.test_client().get(f"/planet/")
assert response.status_code == 200
def test_404():
response = app.test_client().get('/unknown')
response = app.test_client().get("/unknown")
assert response.status_code == 404
response = app.test_client().get('/docs/unknown')
response = app.test_client().get("/docs/unknown")
assert response.status_code == 404
response = app.test_client().get('/feed/unknown')
response = app.test_client().get("/feed/unknown")
assert response.status_code == 404
def test_read_posts():
response = app.test_client().get('/posts/actualites')
response = app.test_client().get("/posts/actualites")
assert response.status_code == 200
response = app.test_client().get('/posts/emplois')
response = app.test_client().get("/posts/emplois")
assert response.status_code == 200