Upgrade to 1.12

[DJShadow1966]

Hello

Since Micropython 1.12 was released every build I make still says 1.11 when checking in the console. My Micropython source code has been updated using

Code: Select all

git pull origin master
git submodule update --init --recursive

I built a STM32 build today and says on

Code: Select all

MicroPython v1.11-725-g10709846f-dirty on 2020-01-03; MCUDEV STM32F407VE with STM32F407VE

Can somebody help ?
Regards Mike

[jimmo]

I'm guessing you're using https://github.com/mcauser/BLACK_F407VE as I don't believe this board is supported in the main repo?

Edit: removed the previous message. Misread your question.

On second thought, looking at the banner, the date and hash indicate that it is 1.12...

hrmmm, have you tried running "make BOARD=BLACK_F407VE clean" ?

Sounds like something is going wrong with the genhdr step that generates the banner from mpconfig.h. If clean doesn't help then we can look into that.

[jimmo]

Can you look at build-BLACK_F407VE/genhdr/mpversion.h and see what the banner looks like there?

Compare that to the output of

Code: Select all

git describe --dirty --always

which is what py/makeversionhdr.py uses to generate that file.

[DJShadow1966]

Hello

The mpversion.h is

Code: Select all

// This file was generated by py/makeversionhdr.py
#define MICROPY_GIT_TAG "v1.11-725-g10709846f-dirty"
#define MICROPY_GIT_HASH "10709846f-dirty"
#define MICROPY_BUILD_DATE "2020-01-03"

and the git is

Code: Select all

v1.11-725-g10709846f-dirty

So these match,

Also just built the esp generic as well to see if that makes any difference and the makeversion.h file is actually the same.

In both builds always do a make clean.

As a test I re git cloned the directory to a test location as I thought was going crazy and that is now showing 1.12 but my original still says 1.11 even though it says up to date ?

Regards Mike

[jimmo]

So that means that your git repo doesn't appear to have the v1.12 tag? Can you run "git tag -l"

What's your origin remote? "git remote -v"

And what's the HEAD commit? "git log -n 1"

[DJShadow1966]

Hello

Code: Select all

sysadmin@mort:~/micropython$ git remote -v
origin  https://github.com/micropython/micropython.git (fetch)
origin  https://github.com/micropython/micropython.git (push)

and

Code: Select all

commit 10709846f38f8f6519dee27694ce583926a00cb9 (HEAD -> master, origin/master, origin/HEAD)
Author: Nicko van Someren <nicko@nicko.org>
Date:   Wed Nov 20 18:53:07 2019 -0700

    py/objslice: Inline fetching of slice paramters in str_subscr().

    To reduce code size.

I am going to rebuild the repo dont have many personalised code but will keep the old one in case you need more data.

Regards Mike