Merge branch 'cherry-pick-126f7201' into 'release/1.14'

'Fix import errors during production docker build' into release/1.14

See merge request !763

resources/entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-sphinx-build -b html /usr/src/app/docs/ /concrexit/docs/ -j $(nproc)
+sphinx-build -b html /usr/src/app/docs/ /concrexit/docs/
 
 until psql -h "$DJANGO_POSTGRES_HOST" -U "postgres" -c '\l'; do
     >&2 echo "PostgreSQL is unavailable: Sleeping"

resources/entrypoint_production.sh

@@ -3,7 +3,7 @@
 set -e
 
 >&2 echo "Creating Sphinx documentation"
-sphinx-build -b html /usr/src/app/docs/ /concrexit/docs/ -j $(nproc)
+sphinx-build -b html /usr/src/app/docs/ /concrexit/docs/
 
 until psql -h "$DJANGO_POSTGRES_HOST" -U "postgres" -c '\l' $POSTGRES_DB; do
     >&2 echo "PostgreSQL is unavailable: Sleeping"

website/utils/management/commands/createfixtures.py

@@ -53,7 +53,7 @@ class _ProfileFactory(factory.Factory):
     address_postal_code = factory.LazyAttribute(lambda x: _faker.postcode())
     address_city = factory.LazyAttribute(lambda x: _faker.city())
 
-    phone_number = '+31' + _faker.numerify(text="##########")
+    phone_number = '+31{}'.format(_faker.numerify(text="##########"))
 
 
 class Command(BaseCommand):
@@ -267,7 +267,10 @@ class Command(BaseCommand):
         partner = Partner()
 
         partner.is_active = random.random() < 0.75
-        partner.name = _faker.company() + ' ' + _faker.company_suffix()
+        partner.name = '{} {}'.format(
+            _faker.company(),
+            _faker.company_suffix()
+        )
         partner.slug = _faker.slug()
         partner.link = _faker.uri()