Reorder imports and fix trailing spaces
This commit is contained in:
parent
1e9d731715
commit
3442edd2bf
1
apps.py
1
apps.py
|
@ -2,7 +2,6 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from django.apps import AppConfig
|
||||
from django.core.signals import got_request_exception
|
||||
|
||||
|
||||
class ScriptsConfig(AppConfig):
|
||||
|
|
|
@ -5,10 +5,9 @@ import json
|
|||
import time
|
||||
from collections import defaultdict
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.apps import apps
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.db import transaction
|
||||
|
||||
from polymorphic.models import PolymorphicModel
|
||||
|
||||
|
||||
|
@ -16,6 +15,7 @@ def timed(method):
|
|||
""""
|
||||
A simple decorator to measure time elapsed in class function (hence the args[0])
|
||||
"""
|
||||
|
||||
def _timed(*args, **kw):
|
||||
ts = time.time()
|
||||
result = method(*args, **kw)
|
||||
|
|
|
@ -13,6 +13,7 @@ class Command(BaseCommand):
|
|||
"""
|
||||
Generate Javascript translation files
|
||||
"""
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
for code, _ in settings.LANGUAGES:
|
||||
if code == settings.LANGUAGE_CODE:
|
||||
|
|
|
@ -5,9 +5,7 @@ from datetime import date
|
|||
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.management import BaseCommand
|
||||
from django.db.models import Q
|
||||
from member.models import Membership, Club
|
||||
from wei.models import WEIClub
|
||||
from member.models import Club, Membership
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
|
|
@ -11,7 +11,6 @@ from django.core.management.base import BaseCommand
|
|||
from django.db import transaction
|
||||
from django.db.models import Q
|
||||
from django.test import override_settings
|
||||
|
||||
from note.models import Alias, Transaction
|
||||
|
||||
|
||||
|
|
|
@ -1,23 +1,19 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import psycopg2 as pg
|
||||
import psycopg2.extras as pge
|
||||
import datetime
|
||||
import json
|
||||
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.timezone import make_aware, now
|
||||
import psycopg2 as pg
|
||||
import psycopg2.extras as pge
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
|
||||
from django.db import transaction
|
||||
|
||||
from note.models import Note, NoteUser, NoteClub
|
||||
from note.models import Alias
|
||||
from django.utils.timezone import make_aware
|
||||
from member.models import Club, Profile
|
||||
from note.models import Alias, Note, NoteClub, NoteUser
|
||||
|
||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
||||
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||
|
||||
M_DURATION = 396
|
||||
M_START = datetime.date(2019, 8, 1)
|
||||
|
|
|
@ -3,16 +3,13 @@
|
|||
|
||||
import psycopg2 as pg
|
||||
import psycopg2.extras as pge
|
||||
import datetime
|
||||
import copy
|
||||
|
||||
from django.utils.timezone import make_aware
|
||||
from activity.models import Activity, ActivityType, Entry, Guest
|
||||
from django.db import transaction
|
||||
|
||||
from activity.models import ActivityType, Activity, Guest, Entry
|
||||
from django.utils.timezone import make_aware
|
||||
from member.models import Club
|
||||
from note.models import Note, NoteUser
|
||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
||||
|
||||
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||
|
||||
MAP_ACTIVITY = dict()
|
||||
|
||||
|
@ -29,6 +26,7 @@ CLUB_RELOU = [
|
|||
2365, # Pot Vieux
|
||||
]
|
||||
|
||||
|
||||
class Command(ImportCommand):
|
||||
"""
|
||||
Import command for Activities Base Data (Comptes, and Aliases)
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
import subprocess
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.core.management import call_command
|
||||
|
||||
from ._import_utils import ImportCommand
|
||||
|
||||
|
||||
class Command(ImportCommand):
|
||||
"""
|
||||
Command for importing the database of NK15.
|
||||
|
|
|
@ -1,31 +1,25 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import copy
|
||||
import datetime
|
||||
import re
|
||||
|
||||
import pytz
|
||||
import psycopg2 as pg
|
||||
import psycopg2.extras as pge
|
||||
import pytz
|
||||
import datetime
|
||||
import copy
|
||||
|
||||
from activity.models import Entry, GuestTransaction
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils.timezone import make_aware
|
||||
from django.db import transaction
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
|
||||
from note.models import (TemplateCategory,
|
||||
TransactionTemplate,
|
||||
Transaction,
|
||||
RecurrentTransaction,
|
||||
SpecialTransaction,
|
||||
MembershipTransaction,
|
||||
)
|
||||
from note.models import Note, NoteClub
|
||||
from activity.models import Guest, GuestTransaction, Entry
|
||||
|
||||
from django.db import transaction
|
||||
from django.utils.timezone import make_aware
|
||||
from member.models import Membership
|
||||
from treasury.models import Remittance, SpecialTransactionProxy, SogeCredit
|
||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
||||
from note.models import (MembershipTransaction, Note, NoteClub,
|
||||
RecurrentTransaction, SpecialTransaction,
|
||||
TemplateCategory, Transaction, TransactionTemplate)
|
||||
from treasury.models import Remittance, SogeCredit, SpecialTransactionProxy
|
||||
|
||||
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||
|
||||
MAP_TRANSACTION = dict()
|
||||
MAP_REMITTANCE = dict()
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import os
|
||||
from bs4 import BeautifulSoup
|
||||
from django.core.management import BaseCommand
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from urllib.parse import urlencode
|
||||
from urllib.request import Request, urlopen
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from activity.models import Activity
|
||||
from django.core.management import BaseCommand
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
|
|
@ -6,7 +6,6 @@ from datetime import timedelta
|
|||
from django.core.management.base import BaseCommand
|
||||
from django.db.models import Count
|
||||
from django.utils import timezone
|
||||
|
||||
from note.models import RecurrentTransaction, TransactionTemplate
|
||||
|
||||
|
||||
|
|
|
@ -8,8 +8,7 @@ from django.core.management import BaseCommand
|
|||
from django.db.models import Q
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.translation import activate
|
||||
|
||||
from note.models import NoteUser, Note
|
||||
from note.models import Note
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from datetime import timedelta
|
||||
|
||||
from django.core.management import BaseCommand
|
||||
from django.db.models import Q
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import activate
|
||||
|
||||
from note.models import NoteUser, Transaction
|
||||
from note.tables import HistoryTable
|
||||
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.apps import apps
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.db import connection
|
||||
|
||||
|
||||
from polymorphic.models import PolymorphicModel
|
||||
|
||||
NO_SEQ = [
|
||||
|
@ -14,6 +12,7 @@ NO_SEQ = [
|
|||
"WEIRole", # dirty fix
|
||||
]
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
"""
|
||||
Command to synchronise primary sequence of postgres after bulk insert of django.
|
||||
|
|
Loading…
Reference in New Issue