fix updated branch / robotpkg

Pipfile

@@ -4,6 +4,7 @@ name = "pypi"
 verify_ssl = true
 
 [dev-packages]
+yapf = "*"
 
 [packages]
 ndh = ">=3.9.0"

Pipfile.lock

 {
     "_meta": {
         "hash": {
-            "sha256": "1f322b5fa702415088922c7453b87578ba6ba6a5c0430d5cc6562f815c3ce170"
+            "sha256": "9bc780128007d5326005e242f24398b2da3ea023fc8fa99fe847a17bc4f0035b"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,10 +18,10 @@
     "default": {
         "certifi": {
             "hashes": [
-                "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c",
-                "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a"
+                "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7",
+                "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033"
             ],
-            "version": "==2018.10.15"
+            "version": "==2018.11.29"
         },
         "chardet": {
             "hashes": [
@@ -32,11 +32,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:1ffab268ada3d5684c05ba7ce776eaeedef360712358d6a6b340ae9f16486916",
-                "sha256:dd46d87af4c1bf54f4c926c3cfa41dc2b5c15782f15e4329752ce65f5dad1c37"
+                "sha256:068d51054083d06ceb32ce02b7203f1854256047a0d58682677dd4f81bceabd7",
+                "sha256:55409a056b27e6d1246f19ede41c6c610e4cab549c005b62cbeefabc6433356b"
             ],
             "index": "pypi",
-            "version": "==2.1.3"
+            "version": "==2.1.4"
         },
         "django-autoslug-iplweb": {
             "hashes": [
@@ -92,10 +92,10 @@
         },
         "idna": {
             "hashes": [
-                "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
-                "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"
+                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
+                "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
             ],
-            "version": "==2.7"
+            "version": "==2.8"
         },
         "ndh": {
             "hashes": [
@@ -114,11 +114,11 @@
         },
         "requests": {
             "hashes": [
-                "sha256:65b3a120e4329e33c9889db89c80976c5272f56ea92d3e74da8a463992e3ff54",
-                "sha256:ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"
+                "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
+                "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
             ],
             "index": "pypi",
-            "version": "==2.20.1"
+            "version": "==2.21.0"
         },
         "smmap2": {
             "hashes": [
@@ -135,5 +135,14 @@
             "version": "==1.24.1"
         }
     },
-    "develop": {}
+    "develop": {
+        "yapf": {
+            "hashes": [
+                "sha256:8aa7f9abdb97b4da4d3227306b88477982daafef0a96cc41639754ca31f46d55",
+                "sha256:f2df5891481f94ddadfbf8ae8ae499080752cfb06005a31bbb102f3012f8b944"
+            ],
+            "index": "pypi",
+            "version": "==0.25.0"
+        }
+    }
 }

rainboard/models.py

@@ -116,8 +116,11 @@ class Forge(Links, NamedModel):
     def get_namespaces_github(self):
         for namespace in Namespace.objects.filter(group=True):
             for data in self.api_list(f'/orgs/{namespace.slug}/members'):
-                Namespace.objects.get_or_create(slug=data['login'].lower(),
-                                                defaults={'name': data['login'], 'group': False})
+                Namespace.objects.get_or_create(
+                    slug=data['login'].lower(), defaults={
+                        'name': data['login'],
+                        'group': False
+                    })
 
     def get_namespaces_gitlab(self):
         for data in self.api_list('/namespaces'):
@@ -308,10 +311,12 @@ class Project(Links, NamedModel, TimeStampedModel):
             self.version = tag.name[1:]
         robotpkg = self.robotpkg_set.order_by('-updated').first()
         branch = self.branch_set.order_by('-updated').first()
-        if (branch is not None and branch.updated is not None) or robotpkg is not None:
-            if robotpkg is None:
+        branch_updated = branch is not None and branch.updated is not None
+        robotpkg_updated = robotpkg is not None and robotpkg.updated is not None
+        if branch_updated or robotpkg_updated:
+            if robotpkg_updated:
                 self.updated = branch.updated
-            elif branch is None or branch.updated is None:
+            elif branch_updated:
                 self.updated = robotpkg.updated
             else:
                 self.updated = max(branch.updated, robotpkg.updated)
@@ -926,7 +931,8 @@ def update_github(forge, namespace, data):
         return
     logger.info(f'update {data["name"]} from {forge}')
     project, _ = Project.objects.get_or_create(
-        name=valid_name(data['name']), defaults={
+        name=valid_name(data['name']),
+        defaults={
             'homepage': data['homepage'],
             'main_namespace': namespace,
             'main_forge': forge