Skip to content

[Backport branch-7-6] Improved initial check on generating reference maps, avoid crash with label styles (symbol errors), removed dead code.#6298

Merged
sdlime merged 2 commits intoMapServer:branch-7-6from
MapServer-backport-bot:backport-6297-to-branch-7-6
Apr 15, 2021
Merged

[Backport branch-7-6] Improved initial check on generating reference maps, avoid crash with label styles (symbol errors), removed dead code.#6298
sdlime merged 2 commits intoMapServer:branch-7-6from
MapServer-backport-bot:backport-6297-to-branch-7-6

Conversation

@MapServer-backport-bot
Copy link
Copy Markdown
Contributor

Backport 00e5b98 from #6297

@jmckenna jmckenna added this to the 7.6.3 milestone Apr 15, 2021
@jmckenna
Copy link
Copy Markdown
Member

@sdlime sorry to sound annoying, but do you mind editing the title of this pull request (because when I generate the changelog for the release later, the summary for this change will only say "fix a couple of things"...and usually when this happens in the changelog i have to manually go find the ticket and update the changelog html with better description, for the readers). thanks!

@sdlime sdlime changed the title [Backport branch-7-6] Fixes for a couple of things I ran into when doing an upgrade on app [Backport branch-7-6] Improved initial check on generating reference maps, avoid crash with label styles (symbol errors), removed dead code. Apr 15, 2021
@sdlime
Copy link
Copy Markdown
Member

sdlime commented Apr 15, 2021

@sdlime sorry to sound annoying, but do you mind editing the title of this pull request (because when I generate the changelog for the release later, the summary for this change will only say "fix a couple of things"...and usually when this happens in the changelog i have to manually go find the ticket and update the changelog html with better description, for the readers). thanks!

Sorry, no problem. Main has the old description though - can that be changed?

@sdlime
Copy link
Copy Markdown
Member

sdlime commented Apr 15, 2021

TravisCI died for a reason other than my changes - which were pretty benign.

@rouault
Copy link
Copy Markdown
Contributor

rouault commented Apr 15, 2021

TravisCI died for a reason other than my changes

TravisCI for the 7.6 branch is defunct. Proably due to Trusty being too old or python 2.7 choking with pip.

@jmckenna
Copy link
Copy Markdown
Member

All has been well in branch-7-6 until a change a few days ago....will investigate now....

@jmckenna
Copy link
Copy Markdown
Member

regarding Python 2.7 and PIP, we should not rely on such an old release (I think this was a change recently, for pip to run with a dev's older Python 2.7). But obviously that is not sustainable (good word), so let's put that back to run on Python3......looking now...

@dmorissette
Copy link
Copy Markdown
Contributor

@jmckenna if you are alluding to PR #6285, then for the record the "dev's old python 2.7" you are alluding to is actually our official Vagrant config (and not my or anyone's old python 2.7). This Vagrant config is required to update/upgrade msautotest results. Full story in the PR.

@jmckenna
Copy link
Copy Markdown
Member

ah thanks @dmorissette, I was assuming our vagrant config was changed for Python 2.7, sorry my mistake.

@jmckenna
Copy link
Copy Markdown
Member

By the way, great to see so many watching so closely! This is a good problem to have :)

@jmckenna
Copy link
Copy Markdown
Member

Gotta love open source, only way to get people to speak-up is to make a mistake :)

@sdlime sdlime merged commit 6d06cfa into MapServer:branch-7-6 Apr 15, 2021
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.

5 participants