Merge branch 'master' into staging-next

2021-03-18 19:24:39 +01:00
parent 0136206b12 94bcca22ff
commit 2445e9a681
91 changed files with 982 additions and 256 deletions
@@ -19,10 +19,9 @@ let
          requests
          websocket_client
          ipaddress
-          backports_ssl_match_hostname
          docker_pycreds
          uptime
-        ];
+        ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];

        # due to flake8
        doCheck = false;