diff --git a/README.md b/README.md
index 27e45d1275a9eda28ca92fc124b048ba08849c98..339fb66251be85e9feee33399d6542e16fcb35d4 100644
--- a/README.md
+++ b/README.md
@@ -60,3 +60,10 @@ Install development tools
pip install -r requirements-dev.txt
pre-commit install
```
+
+please use black,isort and flake8 to ensure coherent code style
+```
+black transporte
+isort --profile black transporte
+flake8 transporte
+```
diff --git a/create_testentrys.py b/create_testentrys.py
index a2f4d5abe75d74598e51dfd35ef20a513348bba3..547a87ac8e69dbb7dc3bc04d41782a6afed81605 100644
--- a/create_testentrys.py
+++ b/create_testentrys.py
@@ -1,14 +1,14 @@
-from transporte import transporte
-from transporte.models import *
-from datetime import date, time, timedelta
-from random import randint, choice
import string
+from datetime import date, time, timedelta
+from random import choice, randint
-roles = ['helpdesk', 'user']
+from transporte.models import Transport, User, db
-user = User.query.filter(User.login == 'test@psy.rocks').first()
+roles = ["helpdesk", "user"]
+
+user = User.query.filter(User.login == "test@psy.rocks").first()
if user is None:
- user = User(login='test@psy.rocks', role='admin')
+ user = User(login="test@psy.rocks", role="admin")
db.session.add(user)
db.session.commit()
@@ -16,47 +16,75 @@ users = User.query.all()
while len(users) < 4:
user = User(
- login='{}@test.psy.rocks'.format(''.join([choice(string.ascii_lowercase) for _ in range(5)]), role='admin'))
+ login="{}@test.psy.rocks".format(
+ "".join([choice(string.ascii_lowercase) for _ in range(5)])
+ ),
+ role="admin",
+ )
db.session.add(user)
db.session.commit()
users.append(user)
-organizers = ['CCCV', 'NOC', 'BOC', 'foobar']
-addresses = ['CCCV GmbH (Lager Berlin)\nHolzhauser Straße 139\n13509 Berlin', 'Messe Leipzig\nHalle 4',
- 'CCCV GmbH (Lager Leipzig)\nDiezmannstraße 20\n04207 Leipzig', 'Getränkelieferant Hamburg']
-vehicles = ['car', 'trailer', 'transporter', '7.5t', '18t', '40t']
-owner = ['Spedition XYZ', 'CCCV', 'Sixt', 'private']
-persons = ['Fahrer XYZ, 0123456789', 'cpunkt, kennste', 'LOC', 'Nick Fahrer']
-goods = ['Congress is coming, LOC Crew needs to be shipped! Defrosting initialized! Cryo capsules in wake up mode.',
- 'Beverages', 'Popcorn', 'Merch', 'Everything!',
- '* Gitterboxen\r\n* Bauzaun\r\n* lauter brandschutzrelevanter Kram']
-comments = ['What a greate comment!\nMultiline!\nGreat line!\n\nGreat!', 'Whoooohooo', 'Yipp yipp yipp',
- '<script>alert(1);</script>']
-
-for i in range(0,2):
- foo = Transport(user_id=choice(users).id, organizer=choice(organizers), needs_organization=randint(0, 1),
- origin=choice(addresses),
- destination=choice(addresses),
- date=date.today()-timedelta(days=i),
- time=time(hour=randint(0, 23),
- minute=randint(0, 59)), vehicle=choice(vehicles),
- goods=choice(goods),
- vehicle_owner=choice(owner),
- driver_contact=choice(persons), orga_contact=choice(persons),
- comment=choice(comments))
+organizers = ["CCCV", "NOC", "BOC", "foobar"]
+addresses = [
+ "CCCV GmbH (Lager Berlin)\nHolzhauser Straße 139\n13509 Berlin",
+ "Messe Leipzig\nHalle 4",
+ "CCCV GmbH (Lager Leipzig)\nDiezmannstraße 20\n04207 Leipzig",
+ "Getränkelieferant Hamburg",
+]
+vehicles = ["car", "trailer", "transporter", "7.5t", "18t", "40t"]
+owner = ["Spedition XYZ", "CCCV", "Sixt", "private"]
+persons = ["Fahrer XYZ, 0123456789", "cpunkt, kennste", "LOC", "Nick Fahrer"]
+goods = [
+ """Congress is coming, LOC Crew needs to be shipped!
+ Defrosting initialized! Cryo capsules in wake up mode."""
+ "Beverages",
+ "Popcorn",
+ "Merch",
+ "Everything!",
+ "* Gitterboxen\r\n* Bauzaun\r\n* lauter brandschutzrelevanter Kram",
+]
+comments = [
+ "What a greate comment!\nMultiline!\nGreat line!\n\nGreat!",
+ "Whoooohooo",
+ "Yipp yipp yipp",
+ "<script>alert(1);</script>",
+]
+
+for i in range(0, 2):
+ foo = Transport(
+ user_id=choice(users).id,
+ organizer=choice(organizers),
+ needs_organization=randint(0, 1),
+ origin=choice(addresses),
+ destination=choice(addresses),
+ date=date.today() - timedelta(days=i),
+ time=time(hour=randint(0, 23), minute=randint(0, 59)),
+ vehicle=choice(vehicles),
+ goods=choice(goods),
+ vehicle_owner=choice(owner),
+ driver_contact=choice(persons),
+ orga_contact=choice(persons),
+ comment=choice(comments),
+ )
db.session.add(foo)
db.session.commit()
for _ in range(10):
- foo = Transport(user_id=choice(users).id, organizer=choice(organizers), needs_organization=randint(0, 1),
- origin=choice(addresses),
- destination=choice(addresses),
- date=date.today()+timedelta(days=randint(0, 31)),
- time=time(hour=randint(0, 23),
- minute=randint(0, 59)), vehicle=choice(vehicles),
- goods=choice(goods),
- vehicle_owner=choice(owner),
- driver_contact=choice(persons), orga_contact=choice(persons),
- comment=choice(comments))
+ foo = Transport(
+ user_id=choice(users).id,
+ organizer=choice(organizers),
+ needs_organization=randint(0, 1),
+ origin=choice(addresses),
+ destination=choice(addresses),
+ date=date.today() + timedelta(days=randint(0, 31)),
+ time=time(hour=randint(0, 23), minute=randint(0, 59)),
+ vehicle=choice(vehicles),
+ goods=choice(goods),
+ vehicle_owner=choice(owner),
+ driver_contact=choice(persons),
+ orga_contact=choice(persons),
+ comment=choice(comments),
+ )
db.session.add(foo)
db.session.commit()
diff --git a/setup.py b/setup.py
index 1a400fef1009fd2dc716f10e85a3633ddb990594..ea9dd6a8e9becc38c95e6de56de9a7632cddbf24 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
from setuptools import setup
setup(
- name='transporte',
- packages=['transporte'],
+ name="transporte",
+ packages=["transporte"],
include_package_data=True,
install_requires=[
- 'flask',
+ "flask",
],
-)
\ No newline at end of file
+)