From 3399036cf532ff761704fd40a20405488ac938fe Mon Sep 17 00:00:00 2001 From: Stefan Pratter Date: Fri, 9 Nov 2018 09:57:05 +0000 Subject: [PATCH 1/3] docs --- docs/deploy.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/deploy.md b/docs/deploy.md index e09e99a3..c3a49653 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -22,7 +22,7 @@ mv compiler.jar ~/.local/google ### Install facsimile ```sh -pip install facsimile +pip install facsimile jinja2 ``` ### Clone peeringdb @@ -97,6 +97,7 @@ mysql -u root -p < .facsimile/tmp/RELEASE/dev/peeringdb/init.sql ## Migrate database - empty, from scratch ```sh +. ~/srv/dev.peeringdb.com/venv/bin/activate ./manage.py migrate ./manage.py createcachetable ./manage.py loaddata fixtures/initial_data.json From 8706c67719b4cd04b36fda6986d2de2f17b79f90 Mon Sep 17 00:00:00 2001 From: Stefan Pratter Date: Fri, 9 Nov 2018 09:57:36 +0000 Subject: [PATCH 2/3] yapf style --- .style.yapf | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .style.yapf diff --git a/.style.yapf b/.style.yapf new file mode 100644 index 00000000..a1144902 --- /dev/null +++ b/.style.yapf @@ -0,0 +1,13 @@ + +[style] +ALLOW_SPLIT_BEFORE_DICT_VALUE = false +INDENT_DICTIONARY_VALUE = true +based_on_style = pep8 +DEDENT_CLOSING_BRACKETS=false +#COALESCE_BRACKETS=true + +SPLIT_PENALTY_IMPORT_NAMES=0 +SPLIT_BEFORE_NAMED_ASSIGNS=0 +SPLIT_PENALTY_AFTER_OPENING_BRACKET=0 + +SPLIT_ARGUMENTS_WHEN_COMMA_TERMINATED=true From 3cfa80c6bfe65efbdbbe772fd85118699e3b13ae Mon Sep 17 00:00:00 2001 From: Stefan Pratter Date: Fri, 9 Nov 2018 09:58:34 +0000 Subject: [PATCH 3/3] yapf it --- .../management/commands/pdb_load_data.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/peeringdb_server/management/commands/pdb_load_data.py b/peeringdb_server/management/commands/pdb_load_data.py index 9c3c5f30..4579a4fc 100644 --- a/peeringdb_server/management/commands/pdb_load_data.py +++ b/peeringdb_server/management/commands/pdb_load_data.py @@ -12,6 +12,7 @@ from peeringdb_server import signals from django_peeringdb import models as djpdb_models from django_peeringdb import sync + def sync_obj(cls, row): """ we need to override django peeringdb's sync_obj function @@ -51,7 +52,6 @@ def sync_obj(cls, row): except ValidationError as e: pass - for field in cls._meta.get_fields(): ftyp = cls._meta.get_field(field.name) value = getattr(obj, field.name, None) @@ -69,6 +69,7 @@ def sync_obj(cls, row): obj.save() return + sync.sync_obj = sync_obj @@ -76,35 +77,34 @@ class Command(BaseCommand): help = "Load initial data from another peeringdb instance" def add_arguments(self, parser): - parser.add_argument("--url", default="https://www.peeringdb.com/api/", type=str) + parser.add_argument("--url", default="https://www.peeringdb.com/api/", + type=str) def handle(self, *args, **options): if settings.RELEASE_ENV != "dev": raise Exception("This command can only be run on dev instances") - settings.USE_TZ = False settings.PEERINGDB_SYNC_URL = options.get("url") - pre_save.disconnect(signals.addressmodel_save, sender=pdb_models.Facility) + pre_save.disconnect(signals.addressmodel_save, + sender=pdb_models.Facility) djpdb_models.all_models = [ - pdb_models.Organization, - pdb_models.Facility, - pdb_models.Network, - pdb_models.InternetExchange, - pdb_models.InternetExchangeFacility, - pdb_models.IXLan, - pdb_models.IXLanPrefix, - pdb_models.NetworkContact, - pdb_models.NetworkFacility, + pdb_models.Organization, pdb_models.Facility, pdb_models.Network, + pdb_models.InternetExchange, pdb_models.InternetExchangeFacility, + pdb_models.IXLan, pdb_models.IXLanPrefix, + pdb_models.NetworkContact, pdb_models.NetworkFacility, pdb_models.NetworkIXLan ] for model in djpdb_models.all_models: count = model.objects.all().count() if count > 0: - self.stdout.write("This command should only be called on an empty database") - self.stdout.write("We already found {} {} in the database, aborting.".format(count, model)) + self.stdout.write( + "This command should only be called on an empty database") + self.stdout.write( + "We already found {} {} in the database, aborting.".format( + count, model)) return call_command("pdb_sync")