-
Notifications
You must be signed in to change notification settings - Fork 68
Backport from Wheecode #79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
xloem
wants to merge
144
commits into
master
Choose a base branch
from
back2mecode
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e 'ENDDFS' error.
…was later added to the gradient spiral function. Namely, the ability to set the center position and feedrate for the spiral.
…icure to be controlled when calibreated.
…t ratio hack for 2D plots.
…ints created using mecode.
…/look of the vpython animation.
…ed serial requirement when not in use.
…eaned up matplotlib plotting in view()
Axes are not capitalized and are in wrong order.
use != instead of 'is not' with literals
python 3.10 isn't fully integrated into travis yet requirements.dev.txt was missing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are the changes I made when I forked https://github.com/xloem/wheecode .
The integrations involved merging a rebase to maintain history and close open PRs if merged into the main tree. This can be a little confusing looking at the history as there are two copies of a lot of commits. The rebasing, which moves a commit to a different part of history, lets one integrate commits that have different ancestors. The merging, which unites the histories showing two copies, means github will understand that this code closes the open PRs, and also retains a record in the log of what was done.
I fixed some but not every part here. The github windows tests don't pass and are commented out; windows does pass in circle-ci and travis. I was still working on the older jminardi code, so the python2.7 tests are passing as well, but maybe it makes sense to drop python2.7.
The publishing hook requires a pypi secret to be added to the configuration, so it won't function until that is done. It might be more normative to change it to work on tags starting with 'v' rather than a bare version number if the github action is engaged further.