Skip to content

version: Version bump to 8.1, use no version, cosmetics #2084

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

Merged
merged 4 commits into from
Jan 13, 2022
Merged

version: Version bump to 8.1, use no version, cosmetics #2084

merged 4 commits into from
Jan 13, 2022

Conversation

neteler
Copy link
Member

@neteler neteler commented Jan 12, 2022

Fixes #2080 and completes 029cd8e. In addition to #2083.

  • grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree
  • minor cosmetics

(note: the milestone isn't exactly 8.2.0 but it needs to be redone in the upcoming release_branch_8_2 branch)

Completes 029cd8e

- grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree
@neteler neteler added the bug Something isn't working label Jan 12, 2022
@neteler neteler added this to the 8.2.0 milestone Jan 12, 2022
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

All look good to me including the changes to something else than 8.1. I especially appreciate the fix of grass.itc.it :-) and other outdated links.

RUN ln -sf /usr/local/grass80 /usr/local/grass
RUN ln -sf /usr/local/grass81 /usr/local/grass
Copy link
Member

Choose a reason for hiding this comment

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

Candidate for a bigger change? Something like ln -sf /usr/local/grass* would work too, no? There is only one GRASS in that Docker image. (Same for all Dockerfiles.)

Or ever bigger change, why it is installed to grassXY in the first place? I have /usr/local/share/zsh/ and /usr/local/lib/R there (although I have /usr/local/lib/python2.7/ there too). Obviously, at least this piece is outside of scope of this PR and thus just a side note.

Copy link
Member Author

Choose a reason for hiding this comment

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

Candidate for a bigger change? Something like ln -sf /usr/local/grass* would work too, no? There is only one GRASS in that Docker image. (Same for all Dockerfiles.)

We had that already in the past and it failed (don't recall well why, perhaps it let to a recursive effect somehow). See f1a46d6 for the revert in last summer.

Or ever bigger change, why it is installed to grassXY in the first place? I have /usr/local/share/zsh/ and /usr/local/lib/R there (although I have /usr/local/lib/python2.7/ there too). Obviously, at least this piece is outside of scope of this PR and thus just a side note.

The point is: how to then have distinct GRASS versions installed? But perhaps for another PR...

Copy link
Contributor

Choose a reason for hiding this comment

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

Candidate for a bigger change? Something like ln -sf /usr/local/grass* would work too, no? There is only one GRASS in that Docker image. (Same for all Dockerfiles.)

We had that already in the past and it failed (don't recall well why, perhaps it let to a recursive effect somehow). See f1a46d6 for the revert in last summer.

Or ever bigger change, why it is installed to grassXY in the first place? I have /usr/local/share/zsh/ and /usr/local/lib/R there (although I have /usr/local/lib/python2.7/ there too). Obviously, at least this piece is outside of scope of this PR and thus just a side note.

The point is: how to then have distinct GRASS versions installed? But perhaps for another PR...

Agree this is a question for another PR, but we have already stripped the version from grass executable. For multiple version-installations alternative --prefix and --exec-prefix may be set.

Copy link
Member

Choose a reason for hiding this comment

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

...Something like ln -sf /usr/local/grass* would work too, no?...

...it failed (don't recall well why, perhaps it let to a recursive effect somehow). See f1a46d6...

Hm, I don't see a PR or an error related to that, so hard to say. It worked in other places at least for the executable. I have seen (less general) grass?? elsewhere, so perhaps you or someone else successfully addressed the issue, whatever it was, this way.

...why it is installed to grassXY in the first place? I have /usr/local/share/zsh/ and /usr/local/lib/R there...

The point is: how to then have distinct GRASS versions installed?

Definitively another PR. But what is the use case when you need to have two GRASS versions installed side by side like this? Certainly, it is not these Dockerfiles. I would think that developers don't install the software with sudo to a system location like this either, or? PATH/environment modification and aliases can be used to have custom setups of multiple versions of the same software. Environment modification is exactly what tools like Python virtual environments are using.

@@ -47,7 +47,7 @@ <h2>NOTES</h2>

<h3>Usage in Python scripts</h3>

<a href="https://grass.osgeo.org/grass80/manuals/libpython/">GRASS
<a href="https://grass.osgeo.org/grass81/manuals/libpython/">GRASS
Copy link
Member

Choose a reason for hiding this comment

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

We have grass-stable, so why not grass-development, grass-preview (following naming on the website), or grass-main (following branch name)? (It makes sense to me to merge this PR without/before implementing this suggestion.)

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed we also have
https://grass.osgeo.org/grass-devel/manuals/

At time it doesn't point to anything useful but once this PR is merged we will have grass81 on the server shortly.

So I'll update this PR accordingly.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done in 5af69fa

Copy link
Member

Choose a reason for hiding this comment

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

Great! Thanks.

Copy link
Contributor

@nilason nilason left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@neteler neteler merged commit 15d6526 into OSGeo:main Jan 13, 2022
@neteler neteler deleted the grass8dev_bump_version branch January 13, 2022 08:08
@wenzeslaus wenzeslaus changed the title GRASS GIS 8 dev: version bump to grass81 version: Version bump to 8.1, use no version, cosmetics Apr 27, 2022
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
* GRASS GIS 8 dev: version bump to grass81: Completes 029cd8e
* grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree
* HTML: change https://grass.osgeo.org/grass81/ to https://grass.osgeo.org/grass-devel/
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
* GRASS GIS 8 dev: version bump to grass81: Completes 029cd8e
* grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree
* HTML: change https://grass.osgeo.org/grass81/ to https://grass.osgeo.org/grass-devel/
neteler added a commit to nilason/grass that referenced this pull request Nov 7, 2023
* GRASS GIS 8 dev: version bump to grass81: Completes 029cd8e
* grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree
* HTML: change https://grass.osgeo.org/grass81/ to https://grass.osgeo.org/grass-devel/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants