Merge pull request #3016 from justmobilize/secrets-cleanup-q-w

Secrets Cleanup Q-W

Author: FoamyGuy

Minesweep/.circuitpython.skip

@@ -201,7 +201,7 @@ def play_a_game():
                         set_data(touch_x, touch_y, BOMBDEATH) #reveal a red bomb
                         tilegrid[touch_x, touch_y] = BOMBDEATH
                         return False          #lost
-                    elif under_the_tile > OPEN0 and under_the_tile <= OPEN8:
+                    elif OPEN0 < under_the_tile <= OPEN8:
                         tilegrid[touch_x, touch_y] = under_the_tile
                     elif under_the_tile == OPEN0:
                         tilegrid[touch_x, touch_y] = BLANK

Minesweep/SpriteSheet.bmp renamed to PyPortal/Minesweep/SpriteSheet.bmp

@@ -17,16 +17,23 @@
 """
 
 #pylint:disable=invalid-name
+
+from os import getenv
 import time
 import board
 from adafruit_pyportal import PyPortal
 
-try:
-    from secrets import secrets
-except ImportError:
-    print("""WiFi settings are kept in secrets.py, please add them there!
-the secrets dictionary must contain 'ssid' and 'password' at a minimum""")
-    raise
+# Get WiFi details, ensure these are setup in settings.toml
+ssid = getenv("CIRCUITPY_WIFI_SSID")
+password = getenv("CIRCUITPY_WIFI_PASSWORD")
+
+if None in [ssid, password]:
+    raise RuntimeError(
+        "WiFi settings are kept in settings.toml, "
+        "please add them there. The settings file must contain "
+        "'CIRCUITPY_WIFI_SSID', 'CIRCUITPY_WIFI_PASSWORD', "
+        "at a minimum."
+    )
 
 # Set this to the username you'd like to display tweets from
 username = 'codewisdom'
@@ -53,7 +60,7 @@
                     caption_color=0x808080)
 
 # Set OAuth2.0 Bearer Token
-bearer_token = secrets['twitter_bearer_token']
+bearer_token = getenv('twitter_bearer_token')
 pyportal.set_headers({'Authorization': 'Bearer ' + bearer_token})
 
 while True:

Minesweep/code.py renamed to PyPortal/Minesweep/code.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+from os import getenv
 import time
 import ssl
 import board
@@ -22,26 +23,26 @@
 NEO_CNT = 12  # neopixel count
 # -------------------------------------------------
 
+# Get WiFi details and Adafruit IO keys, ensure these are setup in settings.toml
+# (visit io.adafruit.com if you need to create an account, or if you need your Adafruit IO key.)
+ssid = getenv("CIRCUITPY_WIFI_SSID")
+password = getenv("CIRCUITPY_WIFI_PASSWORD")
+aio_username = getenv("ADAFRUIT_AIO_USERNAME")
+aio_key = getenv("ADAFRUIT_AIO_KEY")
+
 # Set up NeoPixels
 pixels = neopixel.NeoPixel(NEO_PIN, NEO_CNT)
 
-# Get wifi details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
-
 # Setup AIO time query URL
 TIME_URL = "https://io.adafruit.com/api/v2/"
-TIME_URL += secrets["aio_username"]
+TIME_URL += aio_username
 TIME_URL += "/integrations/time/strftime?x-aio-key="
-TIME_URL += secrets["aio_key"]
+TIME_URL += aio_key
 TIME_URL += "&fmt=%25Y%3A%25m%3A%25d%3A%25H%3A%25M%3A%25S"
 
 # Connect to local network
 try:
-    wifi.radio.connect(secrets["ssid"], secrets["password"])
+    wifi.radio.connect(ssid, password)
 except ConnectionError:
     print("Wifi failed to connect.")
     while True:

Minesweep/lose.wav renamed to PyPortal/Minesweep/lose.wav

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+from os import getenv
 import time
 import board
 import rtc
@@ -25,16 +26,13 @@
 # Set up NeoPixels
 pixels = neopixel.NeoPixel(NEO_PIN, NEO_CNT)
 
-# Get wifi details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
+# Get WiFi details, ensure these are setup in settings.toml
+ssid = getenv("CIRCUITPY_WIFI_SSID")
+password = getenv("CIRCUITPY_WIFI_PASSWORD")
 
 # Connect to local network
 try:
-    wifi.radio.connect(secrets["ssid"], secrets["password"])
+    wifi.radio.connect(ssid, password)
 except ConnectionError:
     print("Wifi failed to connect.")
     while True: