Merge branch 'master' into devel

.github/workflows/release.yml

@@ -8,24 +8,25 @@ jobs:
     name: 🔨 Build distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: 🏗 Set up Python 3.8
-        uses: actions/setup-python@v1
+      - name: 🏗 Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: 🏗 Install build dependencies
         run: |
-          python -m pip install wheel octoprint --user
+          python -m pip install wheel --user
+          python -m pip install octoprint
       - name: 🔨 Build a source zip
         run: |
           python setup.py sdist --formats=zip
       - name: 🚚 rename to sdist.zip
         run: |
           mv dist/Marlin\ EEPROM\ editor-*.zip dist/sdist.zip
       - name: ⬆ Upload build result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
           name: dist
           path: dist
@@ -35,15 +36,15 @@ jobs:
     needs: build
     strategy:
       matrix:
-        python: ["2.7", "3.7", "3.8"]
+        python: ["3.7", "3.9", "3.11"]
     runs-on: ubuntu-latest
     steps:
       - name: 🏗 Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -63,7 +64,7 @@ jobs:
       - test-install
     steps:
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -72,7 +73,7 @@ jobs:
           cp dist/sdist.zip release.zip
       - name: 🥅 Catch release ID
         id: get_release
-        uses: bruceadams/get-release@v1.2.2
+        uses: bruceadams/get-release@v1.3.2
         env:
           GITHUB_TOKEN: ${{ github.token }}
       - name: 📦 Attach release artifact

CONTRIBUTING.md

@@ -38,7 +38,7 @@ There's a limited `pytest` test suite, that can be used. Plans to expand this in
 
 Make sure you take credit for your contribution! It's easy to add your name, please do so!
 
-In the file [`octoprint_eeprom_marlin/sponsors_contributors.py`](https://github.com/cp2004/OctoPrint-EEPROM-Marlin/blob/master/octoprint_eeprom_marlin/sponsors_contributors.py) there is a list of contributors, that looks like this:
+In the file [`octoprint_eeprom_marlin/contributors.py`](https://github.com/cp2004/OctoPrint-EEPROM-Marlin/blob/master/octoprint_eeprom_marlin/contributors.py) there is a list of contributors, that looks like this:
 
 ```python
 CONTRIBUTORS = [

README.md

@@ -52,15 +52,19 @@ Backup feature
 ![Backup feature](assets/backup.png)
 
 ## Sponsors
-
-- [@KenLucke](https://github.com/KenLucke)
-- [@iFrostizz](https://github.com/iFrostizz)
-- [@CmdrCody51](https://github.com/CmdrCody51)
-
-As well as 5 others supporting me regularly through [GitHub Sponsors](https://github.com/sponsors/cp2004)!
-
-## Supporting my efforts
-
-I created this project in my spare time, so if you have found it useful or enjoyed using it then please consider [supporting it's development!](https://github.com/sponsors/cp2004). You can sponsor monthly or one time, for any amount you choose.
-
+
+- [@KenLucke](https://github.com/KenLucke)
+- [@CmdrCody51](https://github.com/CmdrCody51)
+
+As well as 2 others supporting me regularly through [GitHub Sponsors](https://github.com/sponsors/cp2004)!
+
+## Supporting my efforts
+
+![GitHub Sponsors](https://img.shields.io/github/sponsors/cp2004?style=for-the-badge&label=Sponsor!&color=red&link=https%3A%2F%2Fgithub.com%2Fsponsors%2Fcp2004)
+
+I created this project in my spare time, and do my best to support the community with issues and help using it. If you have found this useful or enjoyed using it then please consider [supporting it's development! ❤️](https://github.com/sponsors/cp2004). You can sponsor monthly or one time, for any amount you choose.
+
+## Check out my other plugins
+
+You can see all of my published OctoPrint plugins [on the OctoPrint Plugin Repository!](https://plugins.octoprint.org/by_author/#charlie-powell) Or, if you're feeling nosy and want to see what else I'm working on, check out my [GitHub profile](https://github.com/cp2004).
 ## ✏️ 🔧

octoprint_eeprom_marlin/__init__.py

@@ -18,10 +18,10 @@
     _version,
     api,
     backup,
+    contributors,
     data,
     parser,
     settings,
-    sponsors_contributors,
 )
 
 __version__ = _version.get_data()["version"]
@@ -104,8 +104,7 @@ def get_template_vars(self):
         return {
             "version": self._plugin_version,
             "DATA_STRUCTURE": data.ALL_DATA_STRUCTURE,
-            "SPONSORS": sponsors_contributors.export_sponsors(),
-            "CONTRIBUTORS": sponsors_contributors.export_contributors(),
+            "CONTRIBUTORS": contributors.export_contributors(),
         }
 
     # Settings handling - see settings submodule

octoprint_eeprom_marlin/sponsors_contributors.py → octoprint_eeprom_marlin/contributors.py

@@ -12,11 +12,6 @@
 # if username is empty, then it will not be linked
 ##############################################
 
-SPONSORS = [
-    {"name": "Ken Lucke", "username": "KenLucke"},
-    {"name": "Guyot François", "username": "iFrostizz"},
-    {"name": "And 7 others supporting me through GitHub Sponsors!", "username": ""},
-]
 
 CONTRIBUTORS = [
     {"name": "Anderson Silva (Previous maintainer)", "username": "amsbr"},
@@ -26,10 +21,6 @@
 ]
 
 
-def export_sponsors():
-    return _export_urls(SPONSORS)
-
-
 def export_contributors():
     return _export_urls(CONTRIBUTORS)
 

octoprint_eeprom_marlin/templates/contributors.jinja2

@@ -0,0 +1,22 @@
+<div id="EEPROMContributorModal" class="modal hide fade">
+	<div class="modal-header">
+		<a href="#" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+		<h3>Contributors!</h3>
+	</div>
+	<div class="modal-body">
+        <p>These wonderful people have helped out in development of this plugin. Whether it's fixing bugs, improvements to the code, or new features, all are useful!</p>
+        <p>Want to see your name here? Get involved over on the repo. Any help is always appreciated!</p>
+        <ul>
+        {% for contributor in plugin_eeprom_marlin_CONTRIBUTORS %}
+            {% if contributor["url"] %}
+            <li><a href="{{ contributor["url"] }}">{{ contributor["name"] }}</a> </li>
+            {% else %}
+            <li>{{ contributor["name"] }}</li>
+            {% endif %}
+        {% endfor %}
+        </ul>
+    </div>
+	<div class="modal-footer">
+		<a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Close') }}</a>
+	</div>
+</div>

octoprint_eeprom_marlin/templates/eeprom_marlin_settings.jinja2

@@ -35,7 +35,6 @@
 <p>Enjoying the plugin? <strong>Support it's development!</strong> I work on all of my plugins in my spare time, if you think this was worth it please consider supporting my work below:</p>
 
 <a class="btn btn-success" href="https://github.com/sponsors/cp2004/" target="_blank"><i class="fa fa-heart" aria-hidden="true"></i> Support the plugin</a>
-<button class="btn btn-success" data-toggle="modal" data-target="#EEPROMSponsorsModal">View Sponsors</button>
 <button class="btn btn-primary" data-toggle="modal" data-target="#EEPROMContributorModal">View Contributors</button>
 
 <!-- Footer -->
@@ -46,4 +45,4 @@
 </p>
 </div>
 <!-- Sponsors & Contributor modals -->
-{% include "sponsors-contributors.jinja2" %}
+{% include "contributors.jinja2" %}