stage sync + lint some files (#563)

trezor · Apr 16, 2020 · c1ea517 · c1ea517
1 parent 667d0b4
commit c1ea517
Show file tree

Hide file tree

Showing 5 changed files with 266 additions and 176 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,53 +7,34 @@
         },
         "sourceType": "module"
     },
-    "extends": [
-        "eslint:recommended",
-        "plugin:flowtype/recommended"
-    ],
+    "extends": ["eslint:recommended", "plugin:flowtype/recommended"],
     "parser": "babel-eslint",
-    "plugins": [
-        "standard",
-        "promise",
-        "flowtype",
-        "jest"
-    ],
+    "plugins": ["standard", "promise", "flowtype", "jest"],
     "env": {
         "es6": true,
         "node": true,
         "browser": true,
         "webextensions": true,
         "jest": true
     },
-    "globals": {
-
-    },
+    "globals": {},
     "rules": {
         "flowtype/define-flow-type": 1,
         "flowtype/use-flow-type": 1,
-        "flowtype/object-type-delimiter": [
-            2,
-            "semicolon"
-        ],
-        "flowtype/delimiter-dangle": [
+        "flowtype/object-type-delimiter": [2, "semicolon"],
+        "flowtype/delimiter-dangle": [2, "always-multiline"],
+        "comma-dangle": [2, "always-multiline"],
+        "no-unused-vars": [
             2,
-            "always-multiline"
+            {
+                "args": "none",
+                "vars": "all"
+            }
         ],
-        "comma-dangle": [2, "always-multiline"],
-        "no-unused-vars": [2, {
-            "args": "none",
-            "vars": "all"
-        }],
         "no-console": 1,
         "quotes": [2, "single", "avoid-escape"],
-        "linebreak-style": [
-            2,
-            "unix"
-        ],
-        "semi": [
-            2,
-            "always"
-        ],
+        "linebreak-style": [2, "unix"],
+        "semi": [2, "always"],
         "accessor-pairs": 2,
         "arrow-spacing": [2, { "before": true, "after": true }],
         "block-spacing": [2, "always"],
@@ -66,11 +47,11 @@
         "eol-last": 2,
         "eqeqeq": [2, "allow-null"],
         "generator-star-spacing": [2, { "before": true, "after": true }],
-        "handle-callback-err": [2, "^(err|error)$" ],
+        "handle-callback-err": [2, "^(err|error)$"],
         "indent": [2, 4, { "SwitchCase": 1 }],
         "jsx-quotes": [2, "prefer-single"],
         "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
-        "keyword-spacing": [2, {"before": true, "after": true}],
+        "keyword-spacing": [2, { "before": true, "after": true }],
         "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
         "new-parens": 2,
         "no-array-constructor": 2,
@@ -137,20 +118,41 @@
         "no-unneeded-ternary": [2, { "defaultAssignment": false }],
         "no-unreachable": 2,
         "no-useless-call": 2,
-        "no-use-before-define": [2, {"functions": false, "classes": false }],
+        "no-use-before-define": [2, { "functions": false, "classes": false }],
         "no-var": 2,
         "no-with": 2,
         "one-var": [2, { "initialized": "never" }],
-        "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
+        "operator-linebreak": [
+            2,
+            "after",
+            { "overrides": { "?": "before", ":": "before" } }
+        ],
         "padded-blocks": [2, "never"],
         "prefer-const": 2,
         "semi-spacing": [2, { "before": false, "after": true }],
         "space-before-blocks": [2, "always"],
-        "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
+        "space-before-function-paren": [
+            2,
+            { "anonymous": "always", "named": "never" }
+        ],
         "space-in-parens": [2, "never"],
         "space-infix-ops": 2,
         "space-unary-ops": [2, { "words": true, "nonwords": false }],
-        "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
+        "spaced-comment": [
+            2,
+            "always",
+            {
+                "markers": [
+                    "global",
+                    "globals",
+                    "eslint",
+                    "eslint-disable",
+                    "*package",
+                    "!",
+                    ","
+                ]
+            }
+        ],
         "use-isnan": 2,
         "valid-typeof": 2,
         "wrap-iife": [2, "any"],

diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@ logs
 *.log
 .yarnclean
 coverage
+
+# Cache
+__pycache__
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,20 +38,19 @@ deploy review:
     - branches
   tags:
     - deploy
-
-# todo: does not work yet. I would like not to use image with docker installed and rather use 
+# todo: does not work yet. I would like not to use image with docker installed and rather use
 # docker mounted from parent container https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
-# but I'd say it is not configured on the runners at the moment 
+# but I'd say it is not configured on the runners at the moment
 #
 # test integration:
 #   stage: test-integration
-#   dependencies: 
+#   dependencies:
 #     - deploy review
 #   variables:
 #     DOCKER_TLS_CERTDIR: ''
 #   services:
 #     - docker:dind
 #   before_script:
 #     - docker info
-#   script: 
-#     - ./tests/run.sh ci
+#   script:
+#     - ./tests/run.sh ci