Browse Source

test / dev env: upgrade black

Fabian Peter Hammerle 2 years ago
parent
commit
07bd93bc9f
4 changed files with 37 additions and 16 deletions
  1. 1 1
      Pipfile
  2. 28 7
      Pipfile.lock
  3. 7 7
      cc1101/__init__.py
  4. 1 1
      tests/test_gpio.py

+ 1 - 1
Pipfile

@@ -15,7 +15,7 @@ cc1101 = {editable = true,path = "."}
 spidev = "==3.4"
 
 [dev-packages]
-black = "==20.8b1"
+black = "*"
 # >=0.1.1 for https://github.com/blu3r4y/blinkcheck/pull/2
 blinkcheck = {version = ">=0.1.1", markers = "python_version >= '3.8'"}
 mypy = "*"

+ 28 - 7
Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "8472cba3a525f07d424827b1f064956f3796f65fbba7b1fbc63e7f6621a2381f"
+            "sha256": "dc8156d6f3d5e444eea1ecd17cf0cc4957b0d95f6a0631563008602a3aa536f7"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -58,10 +58,32 @@
         },
         "black": {
             "hashes": [
-                "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"
+                "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b",
+                "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176",
+                "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09",
+                "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a",
+                "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015",
+                "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79",
+                "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb",
+                "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20",
+                "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464",
+                "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968",
+                "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82",
+                "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21",
+                "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0",
+                "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265",
+                "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b",
+                "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a",
+                "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72",
+                "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce",
+                "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0",
+                "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a",
+                "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163",
+                "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad",
+                "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"
             ],
             "index": "pypi",
-            "version": "==20.8b1"
+            "version": "==22.3.0"
         },
         "blinkcheck": {
             "hashes": [
@@ -89,11 +111,10 @@
         },
         "click": {
             "hashes": [
-                "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1",
-                "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"
+                "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e",
+                "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==8.0.4"
+            "version": "==8.1.2"
         },
         "coverage": {
             "extras": [

+ 7 - 7
cc1101/__init__.py

@@ -147,7 +147,7 @@ class CC1101:
     _CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ = 26e6
     # see "21 Frequency Programming"
     # > f_carrier = f_XOSC / 2**16 * (FREQ + CHAN * ((256 + CHANSPC_M) * 2**CHANSPC_E-2))
-    _FREQUENCY_CONTROL_WORD_HERTZ_FACTOR = _CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ / 2 ** 16
+    _FREQUENCY_CONTROL_WORD_HERTZ_FACTOR = _CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ / 2**16
 
     # roughly estimated / tested with SDR receiver, docs specify:
     # > can [...] be programmed for operation at other frequencies
@@ -277,7 +277,7 @@ class CC1101:
         See "13 Receiver Channel Filter Bandwidth"
         """
         return cls._CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ / (
-            8 * (4 + mantissa) * (2 ** exponent)
+            8 * (4 + mantissa) * (2**exponent)
         )
 
     def _get_filter_bandwidth_hertz(self) -> float:
@@ -341,9 +341,9 @@ class CC1101:
         # see "12 Data Rate Programming"
         return (
             (256 + mantissa)
-            * (2 ** exponent)
+            * (2**exponent)
             * cls._CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ
-            / (2 ** 28)
+            / (2**28)
         )
 
     @classmethod
@@ -354,14 +354,14 @@ class CC1101:
             math.log2(real / cls._CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ) + 20
         )
         mantissa = round(
-            real * 2 ** 28 / cls._CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ / 2 ** exponent
+            real * 2**28 / cls._CRYSTAL_OSCILLATOR_FREQUENCY_HERTZ / 2**exponent
             - 256
         )
         if mantissa == 256:
             exponent += 1
             mantissa = 0
-        assert 0 < exponent <= 2 ** 4, exponent
-        assert mantissa <= 2 ** 8, mantissa
+        assert 0 < exponent <= 2**4, exponent
+        assert mantissa <= 2**8, mantissa
         return mantissa, exponent
 
     def get_symbol_rate_baud(self) -> float:

+ 1 - 1
tests/test_gpio.py

@@ -102,7 +102,7 @@ def test_line_wait_for_rising_edge(
     wait_args, wait_kwargs = libgpiod_mock.gpiod_line_event_wait.call_args
     assert wait_args[0] == pointer
     assert (
-        wait_args[1].contents.tv_sec + wait_args[1].contents.tv_nsec / 10 ** 9
+        wait_args[1].contents.tv_sec + wait_args[1].contents.tv_nsec / 10**9
     ) == pytest.approx(timeout_seconds, abs=1e-10)
     assert not wait_args[2:]
     assert not wait_kwargs