Integrate changes from microbit-foundation 1.0.0 tag #84

microbit-sam · 2019-01-31T12:44:18Z

Replacing #82

Bring in changes from the Microbit Educational Foundation fork

The aim of this is to create a new 'legacy' branch that has the features of the latest editor but the MicroPython version of the past. This is what we will expect people migrating from microbit.co.uk to use first.

This reverts commit 13ded9b.

microbit-carlos · 2019-01-31T14:08:09Z

VERSION

@@ -0,0 +1 @@
+1.0.0


From the previous PR:

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

microbit-carlos · 2019-01-31T14:12:07Z

VERSION

@@ -0,0 +1 @@
+1.0.0


From the previous PR:

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

I think it's only used by the build/deploy scripts so maybe it should be removed from this PR

This still means that on python-editor there are two different places we need change the version number, any way it could be merged into a single source of truth? (After syncing repos)

As VERSION only exists in the foundation repo I think this is something we should solve out of the tag integration process

Yep absolutely. Could you create a new ticket in the python-editor repo to not forget about this?

microbit-carlos · 2019-01-31T14:13:53Z

Comment from previous PR:

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 5a0e321



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.

microbit-carlos · 2019-01-31T14:14:08Z

Comment from previous PR:

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

microbit-carlos · 2019-01-31T14:14:48Z

Comment from previous PR:

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

Thanks for the update Sam, I've moved the comments from the previous PR to this one.

microbit-sam · 2019-01-31T15:04:07Z

Removed VERSION
Updated editor.html VERSION
firmware.hex and editor.html firmware are the same (tested both)
Updated CHANGELOG
Updated README from ./show to ./bin/show (this is wrong in the foundation README)

microbit-carlos · 2019-01-31T15:17:59Z

The MicroPython hex in the editor.html file ends without a new line:

:00000001FF </div>

Old version of DAPLink will fail to find the end of file record without it (and possible the space at the end of the record line could be a problem as well, I think DAPLink just looks for `:00000001FF\n).

microbit-carlos · 2019-01-31T15:20:28Z

CHANGELOG

+1.0.0
+-----
+
+* Updated MicroPython firmware


Based on the PR diff, it looks like the MicroPython firmware is the same between bbcmicrobit/PythonEditor@master and [email protected].

Hmm.. I'd based that from the commit message in c4ef9c2

Is the hex file from commit c4ef9c2 the same as in https://github.com/bbcmicrobit/PythonEditor/blob/master/firmware.hex ?

Yes, firmware I've got in my clean branch is from master not the commit
I think I must have checked out the wrong file

I've updated the firmware to correct version and tested

Okay, so I am looking at the v1.0.0 release: https://github.com/microbit-foundation/python-editor/tree/1.0.0

And the hex file doesn't look like it is the same than this PR:

https://github.com/microbit-foundation/python-editor/blob/1.0.0/firmware.hex
https://github.com/bbcmicrobit/PythonEditor/blob/23d73277853c621ada1343cd4fca1e5ff0d026e9/firmware.hex

Is it possible there is a missing commit to cherry pick on top of c4ef9c2?

I've managed to mess it up in the final commit that should have just updated the CHANGELOG and README, will amend and push!

Right, so then the v1.0.0 hex file is the same as bbcmicrobit/PythonEditor@master, correct?
https://github.com/microbit-foundation/python-editor/blob/1.0.0/firmware.hex
https://github.com/bbcmicrobit/PythonEditor/blob/master/firmware.hex

If that's the case we'll also have to remove this first line in the changelog about updating MicroPython.

Yeah I think this is right now, I've updated the CHANGELOG
view-source:https://python-editor-1-0-0.microbit.org/

Great, thank you Sam!

CHANGELOG

microbit-carlos · 2019-02-01T00:01:32Z

The PR is ready so I'll merge it, thank you Sam!

We can now start working on a PR for v1.1.0 :)

jaustin and others added 12 commits January 30, 2019 12:19

Replace firmware with version from microbit.co.uk

c4ef9c2

The aim of this is to create a new 'legacy' branch that has the features of the latest editor but the MicroPython version of the past. This is what we will expect people migrating from microbit.co.uk to use first.

Foundation config for deployment

a1cb715

Update script box styling

33c4f98

Remove arbitrary height on script name box at small widths

22464da

Fix positioning / wrapping of script name box

2a1b711

Fix annoying 1px button background gap on first button

6289b57

Add right padding to script name box

60024cd

Move show script to bin directory

99b8250

Revert "Initial export script"

c629ea1

This reverts commit 13ded9b.

Add VERSION

f42c29d

non micro:bit related changes

fb8d43b

Add VERSION

5a0e321

microbit-sam requested a review from microbit-carlos January 31, 2019 12:44

microbit-carlos reviewed Jan 31, 2019

View reviewed changes

microbit-sam added 2 commits January 31, 2019 14:53

Consistent MicroPython Firmware from 1.0.0

dc57330

Update VERSION number to 1.0.0

d5b3d22

microbit-carlos reviewed Jan 31, 2019

View reviewed changes

CHANGELOG Show resolved Hide resolved

microbit-sam force-pushed the 1.0.0-clean branch 2 times, most recently from 23d7327 to a5b4549 Compare January 31, 2019 17:43

Updated CHANGELOG and README

03438dd

microbit-sam force-pushed the 1.0.0-clean branch from a5b4549 to 03438dd Compare January 31, 2019 18:17

microbit-carlos merged commit 7617562 into bbcmicrobit:master Feb 1, 2019

Integrate changes from microbit-foundation 1.0.0 tag #84

Integrate changes from microbit-foundation 1.0.0 tag #84

Uh oh!

Conversation

microbit-sam commented Jan 31, 2019

Uh oh!

microbit-carlos Jan 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

microbit-carlos commented Jan 31, 2019

Uh oh!

microbit-carlos commented Jan 31, 2019

Uh oh!

microbit-carlos commented Jan 31, 2019

Uh oh!

microbit-carlos left a comment

Choose a reason for hiding this comment

Uh oh!

microbit-sam commented Jan 31, 2019

Uh oh!

microbit-carlos commented Jan 31, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

microbit-carlos Jan 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

microbit-carlos commented Feb 1, 2019

Uh oh!

Uh oh!

microbit-carlos Jan 31, 2019 •

edited

Loading

microbit-carlos Jan 31, 2019 •

edited

Loading