Changes

Author: sachaw

.github/workflows/update_protobufs.yml

@@ -15,22 +15,22 @@ jobs:
         run: |
           git pull --recurse-submodules
           git submodule update --remote --recursive
-          
+
       - name: Download nanopb
         run: |
           wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
           tar xvzf nanopb-0.4.6-linux-x86.tar.gz
           mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
-          
+
       - name: Re-generate protocol buffers
         run: |
-          ./bin/regen-protos.sh  
-          
+          ./bin/regen-protobufs.sh
+
       - name: Commit update
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email '[email protected]'
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git add proto
+          git add protobufs
           git add meshtastic
           git commit -m "Update protobuf submodule" && git push || echo "No changes to commit"

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "proto"]
-	path = proto
-	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+[submodule "protobufs"]
+	path = protobufs
+	url = http://github.com/meshtastic/protobufs

Makefile

@@ -26,11 +26,11 @@ lint:
 slow:
 	pytest -m unit --durations=5
 
-proto: FORCE
+protobufs: FORCE
 	git submodule update --init --recursive
 	git pull --rebase
 	git submodule update --remote --merge
-	./bin/regen-protos.sh
+	./bin/regen-protobufs.sh
 
 # run the coverage report and open results in a browser
 cov:

README.md

@@ -1,9 +1,9 @@
 # Meshtastic Python
 
-[![codecov](https://codecov.io/gh/meshtastic/Meshtastic-python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/Meshtastic-python)
+[![codecov](https://codecov.io/gh/meshtastic/python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/python)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/meshtastic)
-[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-python/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/Meshtastic-python/actions/workflows/ci.yml)
-[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-python)](https://cla-assistant.io/meshtastic/Meshtastic-python)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/python/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/python/actions/workflows/ci.yml)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/python)](https://cla-assistant.io/meshtastic/python)
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
 
@@ -14,12 +14,10 @@ This small library (and example application) provides an easy API for sending an
 It also provides access to any of the operations/data available in the device user interface or the Android application.
 Events are delivered using a publish-subscribe model, and you can subscribe to only the message types you are interested in.
 
-
 **[Getting Started Guide](https://meshtastic.org/docs/software/python/python-installation)**
 
 **[Documentation/API Reference](https://python.meshtastic.org/)**
 
-
 ## Stats
 
-![Alt](https://repobeats.axiom.co/api/embed/3d64492daee3a603497071b45e6cdb81d9b2d421.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/c71ee8fc4a79690402e5d2807a41eec5e96d9039.svg "Repobeats analytics image")

bin/regen-protos.sh bin/regen-protosbuf.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
-./nanopb-0.4.6/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`
+./nanopb-0.4.6/generator-bin/protoc -I=protobufs --python_out meshtastic `ls protobufs/*.proto`
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
 
 if [[ $OSTYPE == 'darwin'* ]]; then
   sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
-  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/Meshtastic-protobufs/issues/27)
+  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
   sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
 else
   sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
-  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/Meshtastic-protobufs/issues/27)
+  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
   sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
 fi

meshtastic/__init__.py

@@ -3,7 +3,7 @@
 
 Primary class: SerialInterface
 Install with pip: "[pip3 install meshtastic](https://pypi.org/project/meshtastic/)"
-Source code on [github](https://github.com/meshtastic/Meshtastic-python)
+Source code on [github](https://github.com/meshtastic/python)
 
 properties of SerialInterface:
 

meshtastic/util.py

@@ -196,7 +196,7 @@ def support_info():
     print('')
     print('If having issues with meshtastic cli or python library')
     print('or wish to make feature requests, visit:')
-    print('https://github.com/meshtastic/Meshtastic-python/issues')
+    print('https://github.com/meshtastic/python/issues')
     print('When adding an issue, be sure to include the following info:')
     print(f' System: {platform.system()}')
     print(f'   Platform: {platform.platform()}')

proto

@@ -16,12 +16,12 @@
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/meshtastic/Meshtastic-python",
-    author="Kevin Hester",
-    author_email="[email protected]",
-    license="MIT",
+    url="https://github.com/meshtastic/python",
+    author="Meshtastic Developers",
+    author_email="[email protected]",
+    license="GPL-3.0-only",
     classifiers=[
-        "License :: OSI Approved :: MIT License",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
         "Development Status :: 4 - Beta",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

protobufs

@@ -1,5 +1,5 @@
 readme.txt for single standalone executable zip files that can be
-downloaded from https://github.com/meshtastic/Meshtastic-python/releases
+downloaded from https://github.com/meshtastic/python/releases
 
 If you do not want to install python and/or the python libraries, you can download one of these
 files to run the Meshtastic command line interface (CLI) as a standalone executable.