makerchip-app 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

makerchip/__init__.py

@@ -90,10 +90,10 @@ class MakerchipSession:
     verbose = False
     watch = False
     vcd = None
-    wait_seconds = 1
-    max_retries = 100
+    wait_seconds = -1
+    max_retries = -1
 
-    def __init__(self, design, vcd = None, server=None, from_url=None, status=False, verbose=False, max_retries=100, wait_seconds=1):
+    def __init__(self, design, vcd, server, from_url, status, verbose, max_retries, wait_seconds):
         self.design = design
         self.status = status
         self.verbose = verbose
@@ -230,10 +230,15 @@ class MakerchipSession:
                         else:
                             print_status("Unexpected event: " + event.data, True)
             except Exception as e:
-                # Reconnect immediately if elapsed time since last disconnect is over a minute.
+                # Don't stress if elapsed time since last disconnect is over a minute (no delay and ignore the retry).
                 now = time.perf_counter()
-                if now - self.last_disconnect_time > 60:
+                stress = now - self.last_disconnect_time < 60
+                if stress:
+                    retries = retries + 1
+                else:
                     wait_seconds = 0
+                    retries = retries * 0.8  # We feel better now.
+                #print_status(str(now - self.last_disconnect_time) + ", " + str(retries))
                 # Do not consider CloudFlareTimeout and 0-byte read (also due to CloudFlare) to be errors.
                 zero_bytes = str(e) == "('Connection broken: IncompleteRead(0 bytes read)', IncompleteRead(0 bytes read))"
                 error = not (zero_bytes or isinstance(e, CloudFlareTimeoutException))
@@ -246,11 +251,13 @@ class MakerchipSession:
                     # Disconnect and reconnect.
                     if wait_seconds > 0:
                         print_status(message + " Hang on...", error)
-                    retries = retries + 1
                     self.http_session.close()
                     time.sleep(wait_seconds)
                     print_status(message + " Trying to reconnect... (%s)" % self.last_save_string(), error)
                 self.last_disconnect_time = time.perf_counter()
+                # There's no confirmation of reconnect until a message is received, so for status, we must
+                # simply assume reconnect is successful.
+                print_status(self.last_save_string())
         else:
             print_status("All retries have failed. (%s)" % self.last_save_string(), True)
 
@@ -267,7 +274,7 @@ def run():
     parser.add_argument('--server', type=str, help='Makerchip server. (default: https://app.makerchip.com)')
     parser.add_argument('--status', action='store_true', help='Show the status bar.')
     parser.add_argument('--verbose', action='store_true', help='Report status updates to stderr (unless --status).')
-    parser.add_argument('--max_retries', type=int, default=100, help='Maximum retries for recovering connection.')
+    parser.add_argument('--max_retries', type=int, default=20, help='Maximum immediate retries for recovering connection.')
     parser.add_argument('--wait_seconds', type=int, default=1, help='Seconds between retry attempts.')
     args = parser.parse_args()
     global status

{makerchip_app-1.1.4.dist-info → makerchip_app-1.1.6.dist-info}/LICENSE.md

@@ -1,6 +1,6 @@
 # Released under MIT License
 
-Copyright (c) 2021 Redwood EDA.
+Copyright (c) 2021 Redwood EDA, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

{makerchip_app-1.1.4.dist-info → makerchip_app-1.1.6.dist-info}/METADATA

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: makerchip-app
-Version: 1.1.4
+Version: 1.1.6
 Summary: Makerchip desktop app
 Home-page: https://gitlab.com/rweda/makerchip-app
-Author: Redwood EDA
+Author: Redwood EDA, LLC
 Author-email: makerchip-app@redwoodeda.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Topic :: Text Editors :: Integrated Development Environments (IDE)
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE.md
 Requires-Dist: click
 Requires-Dist: requests
 Requires-Dist: sseclient-py
@@ -20,6 +19,10 @@ Requires-Dist: sseclient-py
 
 ![splash](https://gitlab.com/rweda/makerchip-app/-/raw/00e5519aeb9e14ef527df0ccc44e8aed7f5db269/doc/makerchip_screenshot.png)
 
+## DEPRECATION NOTICE
+
+This project has reached its end of life. Makerchip can now be installed to your desktop on most platforms and from most modern browsers. Visit  [Makerchip](https://makerchip.com).
+
 ## Overview
 
 This repository enables open-source Verilog/SystemVerilog/TL-Verilog development using the [Makerchip](https://makerchip.com) integrated development environment (IDE). Though Makerchip is cloud-based, this project wraps Makerchip with the look, feel, and function of a desktop application for local development, using a "virtual desktop application" model.
@@ -98,4 +101,4 @@ Feel free to contact the [Makerchip team](mailto:help@makerchip.com).
 
 ## Enjoy!
 
-
+[.](https://gitlab.com/rweda/Makerchip-public)

makerchip_app-1.1.6.dist-info/RECORD

@@ -0,0 +1,11 @@
+makerchip/__init__.py,sha256=2hZFF8ihI9tmjxWejhj0dmWIb1WKKrawqGwqkSwLzwQ,13981
+makerchip/__main__.py,sha256=0KgVvK4WBJ6bm0ywoIhGZYe1nd3sOiC17GirNOZlgDw,69
+makerchip/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+makerchip/_vendor/native_web_app.py,sha256=oz0NdWuf7z79_JY1llrAQr7SwZYi-mDUOUmleh-v360,3565
+makerchip/asset/default.tlv,sha256=_tl7EYXxuHwYr2U7GIHatsC_kpHzAvv_8lOtuGcrzv4,566
+makerchip_app-1.1.6.dist-info/LICENSE.md,sha256=tbnCOYafFAkakdpiWZZViCiox4SqlHolu1ajovwrQTY,1091
+makerchip_app-1.1.6.dist-info/METADATA,sha256=rmaJJvbwghm5eH-bdz2fUl7hN9kkMNti3LOl78Hg4yA,3765
+makerchip_app-1.1.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+makerchip_app-1.1.6.dist-info/entry_points.txt,sha256=Ur52vW1HZXGfyBXONqqtXHf0HEupMAVfqVfVSSS5WWI,44
+makerchip_app-1.1.6.dist-info/top_level.txt,sha256=Is3phcRmevW4QVU94nqTTv4kIWYYWDzI9T9c-qigIbU,10
+makerchip_app-1.1.6.dist-info/RECORD,,

{makerchip_app-1.1.4.dist-info → makerchip_app-1.1.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{makerchip_app-1.1.4.dist-info → makerchip_app-1.1.6.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 makerchip = makerchip:run
-

makerchip_app-1.1.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-makerchip/__init__.py,sha256=YutYzwhJ-bDK1cstopWObjM059dLxhDYmQXkhrjQ3U8,13555
-makerchip/__main__.py,sha256=0KgVvK4WBJ6bm0ywoIhGZYe1nd3sOiC17GirNOZlgDw,69
-makerchip/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-makerchip/_vendor/native_web_app.py,sha256=oz0NdWuf7z79_JY1llrAQr7SwZYi-mDUOUmleh-v360,3565
-makerchip/asset/default.tlv,sha256=_tl7EYXxuHwYr2U7GIHatsC_kpHzAvv_8lOtuGcrzv4,566
-makerchip_app-1.1.4.dist-info/LICENSE.md,sha256=9oFrYg3AomT4c7Fci42b8sJh3AIhulQYK52XCQRtxZM,1086
-makerchip_app-1.1.4.dist-info/METADATA,sha256=VjZVYejCPpIIPnSyJYxNCo7atdbjDaL6OOiKj7tFNxA,3519
-makerchip_app-1.1.4.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-makerchip_app-1.1.4.dist-info/entry_points.txt,sha256=KuW52UUdde8mx6pp71_W2mZn6L75_LKedo5itAcGr9o,45
-makerchip_app-1.1.4.dist-info/top_level.txt,sha256=Is3phcRmevW4QVU94nqTTv4kIWYYWDzI9T9c-qigIbU,10
-makerchip_app-1.1.4.dist-info/RECORD,,