diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5f0183..fb9c788 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,16 +8,17 @@ 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 @@ -25,7 +26,7 @@ jobs: 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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 75d13d3..0ed1945 100644 --- a/CONTRIBUTING.md +++ b/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 = [ diff --git a/README.md b/README.md index 3ebd4b4..f08e0f1 100644 --- a/README.md +++ b/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). ## ✏️ πŸ”§ diff --git a/octoprint_eeprom_marlin/__init__.py b/octoprint_eeprom_marlin/__init__.py index 7a37bde..405ac77 100755 --- a/octoprint_eeprom_marlin/__init__.py +++ b/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 diff --git a/octoprint_eeprom_marlin/sponsors_contributors.py b/octoprint_eeprom_marlin/contributors.py similarity index 79% rename from octoprint_eeprom_marlin/sponsors_contributors.py rename to octoprint_eeprom_marlin/contributors.py index 3ea052b..b62cbba 100644 --- a/octoprint_eeprom_marlin/sponsors_contributors.py +++ b/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) diff --git a/octoprint_eeprom_marlin/templates/contributors.jinja2 b/octoprint_eeprom_marlin/templates/contributors.jinja2 new file mode 100644 index 0000000..e1696d8 --- /dev/null +++ b/octoprint_eeprom_marlin/templates/contributors.jinja2 @@ -0,0 +1,22 @@ + diff --git a/octoprint_eeprom_marlin/templates/eeprom_marlin_settings.jinja2 b/octoprint_eeprom_marlin/templates/eeprom_marlin_settings.jinja2 index 1dd584e..9a120ff 100755 --- a/octoprint_eeprom_marlin/templates/eeprom_marlin_settings.jinja2 +++ b/octoprint_eeprom_marlin/templates/eeprom_marlin_settings.jinja2 @@ -35,7 +35,6 @@

Enjoying the plugin? Support it's development! I work on all of my plugins in my spare time, if you think this was worth it please consider supporting my work below:

Support the plugin - @@ -46,4 +45,4 @@

-{% include "sponsors-contributors.jinja2" %} +{% include "contributors.jinja2" %} diff --git a/octoprint_eeprom_marlin/templates/sponsors-contributors.jinja2 b/octoprint_eeprom_marlin/templates/sponsors-contributors.jinja2 deleted file mode 100644 index 1d493e9..0000000 --- a/octoprint_eeprom_marlin/templates/sponsors-contributors.jinja2 +++ /dev/null @@ -1,44 +0,0 @@ - -