From d36c4e2fc753df1d9eebb8d600f1970ea6ad304b Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@uni.lu>
Date: Thu, 19 Nov 2020 16:32:32 +0100
Subject: [PATCH] text-unidecode is used by faker, now they have introduced the
artistic license as well as GPL, we need to check
---
requirements.txt | 5 ++---
smash/db_scripts/create_dummy_data.py | 14 +++++++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 49a543a0..a21f1c3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ django-phonenumber-field==1.3.0
django-stronghold==0.4.0
django-two-factor-auth==1.11
enum34==1.1.6
-Faker==0.9.2
+Faker==4.16.0
funcsigs==1.0.2
gunicorn==19.6.0
idna==2.7
@@ -52,10 +52,9 @@ requests==2.19.1
six==1.15.0
sqlparse==0.2.4
subprocess32==3.5.2
-text-unidecode==1.2
+text-unidecode==1.3
texttable==1.4.0
timeout-decorator==0.4.0
-Unidecode==1.0.22
urllib3==1.23
whitenoise==5.2.0
xlrd==1.1.0
diff --git a/smash/db_scripts/create_dummy_data.py b/smash/db_scripts/create_dummy_data.py
index 42bbd044..aef88557 100644
--- a/smash/db_scripts/create_dummy_data.py
+++ b/smash/db_scripts/create_dummy_data.py
@@ -31,7 +31,6 @@ from numpy.random import choice
from faker import Faker
import platform
import tempfile
-import unidecode
from shutil import copyfile
@@ -40,7 +39,7 @@ class smashProvider(BaseProvider):
__provider__ = 'smash'
__lang__ = 'fr_FR'
fake = Faker()
- fake.seed(4321)
+ Faker.seed(4321)
specialists = ['Psychiatrist', 'Radiologist', 'Immunologist', 'Anesthesiologist',
'Surgeon', 'Pediatrician', 'Neurologist', 'Medical examiner']
@@ -477,7 +476,7 @@ class smashProvider(BaseProvider):
getAlreadyCreatedSmashLanguages = languages[0]
if phone_number is None:
- phone_number = self.fake.phone_number()
+ phone_number = self.fake.phone_number()[:20]
if social_security_number is None:
social_security_number = ''
@@ -529,11 +528,11 @@ class smashProvider(BaseProvider):
last_name = self.fake.last_name().lower()
if username is None:
username = '{}_{}'.format(first_name, last_name)
- username = unidecode.unidecode(username).lower().replace(' ', '_')
+ username = username.lower().replace(' ', '_')
if email is None:
email = '{}.{}@smash.lu'.format(first_name, last_name)
- email = unidecode.unidecode(email)
+ email = email
# create user
defaults = {'email': email, 'password': password}
user, _ = User.objects.update_or_create(
@@ -589,7 +588,7 @@ class smashProvider(BaseProvider):
unit = self.getSmashUnit()
if phone_number is None:
- phone_number = self.fake.phone_number()
+ phone_number = self.fake.phone_number()[:20]
if role is None:
role = self.getWorkerRole()
@@ -608,6 +607,7 @@ class smashProvider(BaseProvider):
defaults = {'first_name': first_name, 'last_name': last_name,
'email': email, 'unit': unit, 'specialization': specialization,
'phone_number': phone_number, 'user': user}
+
worker, _ = Worker.objects.update_or_create(first_name=first_name,
last_name=last_name, defaults=defaults)
@@ -721,7 +721,7 @@ if __name__ == "__main__":
if not os.path.exists(MEDIA_ROOT):
os.makedirs(MEDIA_ROOT)
fake = Faker()
- fake.seed(4321)
+ Faker.seed(4321)
fake.add_provider(smashProvider)
fake.createSmashFlyingTeams()
fake.createSmashItems()
--
GitLab