Merge pull request #126 from paulober/develop

paulober · web-flow · commit 08308c5b30e4 · 2023-08-16T00:00:01.000+02:00
Hotfix v3.2.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ All notable changes to the "MicroPico" extension will be documented in this file
 
 ---
 
+## [3.2.3] - 2023-08-15
+
+# Changed
+- Updated stubs to patch v1.20.0-4 stable (Fixes #125)
+
 ## [3.2.2] - 2023-08-14
 
 # Added
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "pico-w-go",
   "displayName": "MicroPico",
   "description": "Auto-completion, remote workspace and a REPL console integration for the Raspberry Pi Pico (W) with MicroPython firmware.",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "publisher": "paulober",
   "license": "MPL-2.0",
   "homepage": "https://github.com/paulober/MicroPico/blob/main/README.md",
diff --git a/stubs/stdlib/array.pyi b/stubs/stdlib/array.pyi
@@ -1 +1 @@
-from .uarray import *
+from uarray import *
diff --git a/stubs/stdlib/binascii.pyi b/stubs/stdlib/binascii.pyi
@@ -1 +1 @@
-from .ubinascii import *
+from ubinascii import *
diff --git a/stubs/stdlib/errno.pyi b/stubs/stdlib/errno.pyi
@@ -1 +1 @@
-from .uerrno import *
+from uerrno import *
diff --git a/stubs/stdlib/hashlib.pyi b/stubs/stdlib/hashlib.pyi
@@ -1 +1 @@
-from .uhashlib import *
+from uhashlib import *
diff --git a/stubs/stdlib/heapq.pyi b/stubs/stdlib/heapq.pyi
@@ -1 +1 @@
-from .uheapq import *
+from uheapq import *
diff --git a/stubs/stdlib/ussl.pyi b/stubs/stdlib/ussl.pyi
@@ -2,7 +2,7 @@
 Module: 'ssl' on micropython-v1.19.1-rp2
 """
 # MCU: {'ver': 'v1.19.1', 'build': '', 'sysname': 'rp2', 'platform': 'rp2', 'version': '1.19.1', 'release': '1.19.1', 'port': 'rp2', 'family': 'micropython', 'name': 'micropython', 'machine': 'Raspberry Pi Pico W with RP2040', 'nodename': 'rp2'}
-from .usocket import socket
+from usocket import socket
 
 CERT_NONE = 0 # type: int
 """Supported value for cert_reqs parameter"""
diff --git a/stubs/stdlib/zlib.pyi b/stubs/stdlib/zlib.pyi
@@ -1 +1 @@
-from .uzlib import *
+from uzlib import *
diff --git a/stubs/stubs/dht/dht.pyi b/stubs/stubs/dht/dht.pyi
@@ -2,47 +2,47 @@
 Module: 'dht' on micropython-v1.19.1-rp2
 """
 # MCU: {'ver': 'v1.19.1', 'build': '', 'sysname': 'rp2', 'platform': 'rp2', 'version': '1.19.1', 'release': '1.19.1', 'port': 'rp2', 'family': 'micropython', 'name': 'micropython', 'machine': 'Raspberry Pi Pico W with RP2040', 'nodename': 'rp2'}
-from .rp2 import dht_readinto as rp2_dht_readinto
+from typing import Any
 
-def dht_readinto(*args, **kwargs) -> ...:
+def dht_readinto(*args, **kwargs) -> Any:
     """This function will be redirected by micropython 
     the the rp2 module containing dht_readinto implementation for rp2 boards.
     """
-    return rp2_dht_readinto(*args, **kwargs)
+    ...
 
 
 class DHTBase():
     def __init__(self, *argv, **kwargs) -> None:
         ...
 
-    def measure(self, *args, **kwargs) -> ...:
+    def measure(self, *args, **kwargs) -> Any:
         ...
 
 
 class DHT11():
     def __init__(self, *argv, **kwargs) -> None:
         ...
 
-    def measure(self, *args, **kwargs) -> ...:
+    def measure(self, *args, **kwargs) -> Any:
         ...
 
-    def humidity(self, *args, **kwargs) -> ...:
+    def humidity(self, *args, **kwargs) -> Any:
         ...
 
-    def temperature(self, *args, **kwargs) -> ...:
+    def temperature(self, *args, **kwargs) -> Any:
         ...
 
 
 class DHT22():
     def __init__(self, *argv, **kwargs) -> None:
         ...
 
-    def measure(self, *args, **kwargs) -> ...:
+    def measure(self, *args, **kwargs) -> Any:
         ...
 
-    def humidity(self, *args, **kwargs) -> ...:
+    def humidity(self, *args, **kwargs) -> Any:
         ...
 
-    def temperature(self, *args, **kwargs) -> ...:
+    def temperature(self, *args, **kwargs) -> Any:
         ...
 
diff --git a/stubs/stubs/ds18x20/ds18x20.pyi b/stubs/stubs/ds18x20/ds18x20.pyi
@@ -1,8 +1,7 @@
 """DS18x20 temperature sensor driver
 """
 
-from .onewire import OneWire
-
+from onewire import OneWire
 
 class DS18X20:
     def __init__(self, onewire: OneWire) -> None:
diff --git a/stubs/stubs/machine/machine.pyi b/stubs/stubs/machine/machine.pyi
@@ -1 +1 @@
-from .umachine import *
+from umachine import *
diff --git a/stubs/stubs/neopixel/neopixel.pyi b/stubs/stubs/neopixel/neopixel.pyi
@@ -3,7 +3,7 @@ Module: 'neopixel' on micropython-v1.19.1-rp2
 """
 # MCU: {'ver': 'v1.19.1', 'build': '', 'sysname': 'rp2', 'platform': 'rp2', 'version': '1.19.1', 'release': '1.19.1', 'port': 'rp2', 'family': 'micropython', 'name': 'micropython', 'machine': 'Raspberry Pi Pico W with RP2040', 'nodename': 'rp2'}
 from typing import Any
-from .machine import Pin
+from machine import Pin
 
 def bitstream(*args, **kwargs) -> Any:
     ...
diff --git a/stubs/stubs/onewire/onewire.pyi b/stubs/stubs/onewire/onewire.pyi
@@ -1,4 +1,4 @@
-from .machine import Pin
+from machine import Pin
 from collections.abc import Sequence
 
 class OneWire:
diff --git a/stubs/stubs/rp2/rp2.pyi b/stubs/stubs/rp2/rp2.pyi
@@ -1,5 +1,5 @@
-from .uarray import array
-from .machine import Pin
+from uarray import array
+from machine import Pin
 from typing import Any, overload
 
 class Flash:
diff --git a/stubs/stubs/websocket/websocket.pyi b/stubs/stubs/websocket/websocket.pyi
@@ -1 +1 @@
-from .uwebsocket import *
+from uwebsocket import *
diff --git a/stubs/version.json b/stubs/version.json
@@ -1 +1 @@
-{"version": "1.20.0-3"}
+{"version": "1.20.0-4"}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .uarray import *`
	`1`	`+from uarray import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .ubinascii import *`
	`1`	`+from ubinascii import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .uerrno import *`
	`1`	`+from uerrno import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .uhashlib import *`
	`1`	`+from uhashlib import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .uheapq import *`
	`1`	`+from uheapq import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .uzlib import *`
	`1`	`+from uzlib import *`