Skip to content

Integrate changes from microbit-foundation 0.1.0 tag #82

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

Closed
wants to merge 11 commits into from

Conversation

microbit-sam
Copy link
Collaborator

Bring in changes from the Microbit Educational Foundation fork

@microbit-sam microbit-sam self-assigned this Jan 30, 2019
@microbit-carlos
Copy link
Collaborator

Can't comment on the editor.html file in the code view, so I'll add the comment here.

Looks like the version string is different on this branch, if your starting point was bbcmicrobit/PythonEditor master, then it means something has changed it from '0.1.0' to '0.0.0':

PythonEditor/editor.html

Lines 72 to 73 in fb8d43b

<!-- VERSION INFORMATION -->
VERSION = "0.0.0";

Both bbcmicrobit/PythonEditor@master and foundation/[email protected] have that string as '0.1.0'. I think we should divert from both and set this to '1.0.0', as that is what we are calling this version of the editor.

Can we also update the changelog to include info about all these changes?

@@ -0,0 +1 @@
0.1.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's change this to 1.0.0 as well.

@@ -0,0 +1 @@
0.1.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to update this on this release, can we also add it to the RELEASE_TODO.rst file?

@@ -0,0 +1 @@
0.1.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, I am not sure why this file is here and what it does, do you have more context @microbit-sam ?

}

#script-description {
display: none; /* TODO: FIXME: remove this field */
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are removing this box from the UX we should probably just remove all the associated code with it.
We should only do that after both repos are synced, so opened #83.

@microbit-carlos
Copy link
Collaborator

The MicroPython version in the editor.html and firmware.hex files are different, could we replace these to be the same as the [email protected]?
That way the future tag in this repo will be representative of the deployed version 1.0.0 and any other cherry picked commits should apply cleanly.

@microbit-carlos
Copy link
Collaborator

microbit-carlos commented Jan 30, 2019

I just noticed I was comparing this as if it was the v1.0.0 release. Looking at the diff between 0.1.0 and 1.0.0 (https://github.com/microbit-foundation/python-editor/compare/0.1.0...1.0.0), I think we can just cherry pick https://github.com/microbit-foundation/python-editor/commit/ee2edb1dbdcf12d79d4434d63d28ec756a1857f7 and call this branch/PR the 1.0.0 merge.

@microbit-sam microbit-sam deleted the 0.1.0-clean branch January 31, 2019 12:22
@microbit-sam
Copy link
Collaborator Author

Tried to replace this with 1.0.0-clean and deleted the branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants