Merge pull request #116 from guydavis/integration

Version 0.4.0

Author: guydavis

.github/CONTRIBUTING.md

@@ -0,0 +1,75 @@
+## Help us to help you!
+
+Thank you for taking the time to contribute!
+
+* [Suggesting a feature](#suggesting-a-feature)
+* [Filing a bug report](#filing-a-bug-report)
+* [Submitting a pull request](#submitting-a-pull-request)
+
+## Suggesting a feature
+
+We can't think of everything. If you've got a good idea for a feature, then please let us know!
+
+Feature suggestions are embraced, but will often be filed for a rainy day. If you require a feature urgently it's best to write it yourself. Don't forget to share ;)
+
+When suggesting a feature, make sure to:
+
+* Check the code on GitHub to make sure it's not already hiding in an unreleased version ;)
+* Considered if it's necessary in the library, or is an advanced technique that could be separately explained in wiki documentation.
+* Check existing issues, open and closed, to make sure it hasn't already been suggested
+
+## Filing a bug report
+
+If you're having trouble with Machinaris try asking on our Discussions (https://github.com/guydavis/machinaris/discussions) or Discord (https://discord.gg/mX4AtMTt87).  Feel free to submit fixes for documentation too, not just bugs!
+
+If all else fails then please raise an Issue to let us know. Be as detailed as possible, and be ready to answer questions when we get back to you. Make sure you include your system setup:
+
+ - OS: [e.g. Ubuntu, Windows, MacOS, Unraid, etc]
+ - Docker version number (output of `docker info`)
+ - Machinaris branch: main/test/develop (you're probably on main)
+ - Machinaris version number (see bottom of every Machinaris page)
+
+## Submitting a pull request
+
+If you've decided to fix a bug, even something as small as a single-letter typo then great! Anything that improves the code/documentation for all future users is warmly welcomed.
+
+If you decide to work on a  requested feature it's best to let us (and everyone else) know what you're working on to avoid any duplication of effort. You can do this by replying to the original Issue for the request.
+
+If you want to contribute an example; go for it! We might not always be able to accept your code, but there's a lot to be learned from trying anyway and if you're new to GitHub we're willing to guide you on that journey.
+
+When contributing a new example or making a change to a library please keep your code style consistent with ours. We try to stick to the pep8 guidelines for Python (https://www.python.org/dev/peps/pep-0008/).
+
+#### Do
+
+* Do fork the project and work off the `integration` branch.
+* Do use pep8 style guidelines
+* Do comment your code where necessary
+* Do submit only a single example/feature per pull-request
+* Do include a description of what your change is expected to do
+* Do include the new API calls by updating the Postman collection
+
+#### Don't
+
+* Don't include any separate license information in your change - our repo is Apache licensed
+* Don't try to do too much at once - submit one feature/fix at a time, and be receptive to feedback
+
+### Licensing
+
+When you submit code to our libraries, you implicitly and irrevocably agree to adopt the associated licenses. You should be able to find this in the file named `LICENSE`.
+
+We  use the Apache license; which permits Commercial Use, Modification, Distribution and Private use of our code, and therefore also your contributions. It also provides good compatibility with other licenses, and is intended to make re-use of our code as painless as possible for all parties.
+
+You can learn more about the Apache license: https://www.apache.org/licenses/LICENSE-2.0
+
+### Submitting your code
+
+Once you're ready to share your contribution with us you should submit it as a Pull Request.
+
+* Be ready to receive and embrace constructive feedback.
+* Be prepared for rejection; we can't always accept contributions. If you're unsure, ask first!
+
+## Thank you!
+
+If you have any questions, concerns or comments about these guidelines, please get in touch. 
+
+-- Guy Davis - 2021-06-21

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+**Should I file this?**
+Use this template to report *observed bugs in current Machinaris*.  Do not use this to request tech support or troubleshooting; we are unable to provide that support here, so please use the user channel(s) on Discord, or GitHub Discussions instead.
+-->
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+
+Steps to reproduce the behavior, e.g.:
+1. Set up config with '...'
+2. Run other programs '....'
+3. Run Machinaris with '....'
+4. See error
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen, even if it seems obvious. -->
+
+**System setup:**
+ - OS: [e.g. Ubuntu, Windows, MacOS, Unraid, etc]
+ - Docker version number (output of `docker info`)
+ - Machinaris branch: main/test/develop (you're probably on main)
+ - Machinaris version number (see bottom of every Machinaris page)
+
+**Config**
+<details><summary>full configuration</summary>
+
+```
+# paste your Docker run or Docker compose here
+```
+
+</details>
+
+**Additional context & screenshots**
+<!-- Add any other context about the problem here, including full page screenshots. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+contact_links:
+  - about: Ask a general question or request support in Discussions
+    name: Ask for Support
+    url: >-
+      https://github.com/guydavis/machinaris/discussions/new
+  - about: Get support in the Machinaris Discord.
+    name: Join the Machinaris Discord Server
+    url: 'https://discord.gg/mX4AtMTt87'

.github/ISSUE_TEMPLATE/request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Log a request for a new feature or enhancement
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Describe the request**
+<!-- A clear and concise description of your suggested enhancement, as well as some basic rationale to allow us to balance the effort/reward for the work, if possible. -->
+
+**Images**
+<!-- If applicable (but not required), add diagrams or wireframes to help explain your request if it is UI/UX related. -->
+
+**Additional comments**
+<!-- Add any other comments here. -->

.github/pull_request_template.md

@@ -0,0 +1 @@
+<!-- Please develop and target PRs against the integration branch, not main. -->

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, integration ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ main, integration ]
   schedule:
     - cron: '25 23 * * 1'
 

.github/workflows/develop.yaml

@@ -36,10 +36,11 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64
           push: true
           build-args: |
             "CHIA_BRANCH=1.1.7"
+            "PATCH_CHIAPOS=true"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

.github/workflows/test.yaml

@@ -44,6 +44,4 @@ jobs:
             "PATCH_CHIAPOS=true"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}

.gitignore

@@ -129,5 +129,8 @@ dmypy.json
 .pyre/
 
 # Development only webui launch script
-start-webui-dev.sh
-keyfile
+scripts/start-api-dev.sh
+scripts/start-web-dev.sh
+
+# Ignore any local SSH keys
+keyfile

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2021-06-25
+
+- Support for [Madmax plotter](https://github.com/madMAx43v3r/chia-plotter), in addition to official [Chia plotter](https://github.com/Chia-Network/chia-blockchain).
+- Manage multiple plotters, harvesters, and farmers across your LAN, all from a [single WebUI on one controller system](https://github.com/guydavis/machinaris/wiki/Workers).
+
+
 ## [0.3.2] - 2021-06-06
 
 - Include the just released Chia 1.1.7. For details, see their [changelog](https://github.com/Chia-Network/chia-blockchain/blob/1.1.7/CHANGELOG.md#117-chia-blockchain-2021-06-05).