Преглед изворни кода

Needed version updates for GRASS GIS 7.8 (#76)

Markus Neteler пре 5 година
родитељ
комит
f6de22fef3

+ 1 - 1
docker/Dockerfile_alpine

@@ -6,7 +6,7 @@ LABEL authors="Pietro Zambelli"
 LABEL maintainer="peter.zamb@gmail.com"
 
 # PACKAGES VERSIONS
-ARG GRASS_VERSION=7.7
+ARG GRASS_VERSION=7.8
 ARG PYTHON_VERSION=3
 ARG PROJ_VERSION=5.2.0
 ARG PROJ_DATUMGRID_VERSION=1.8

+ 1 - 1
docker/Dockerfile_alpine_wxgui

@@ -6,7 +6,7 @@ LABEL authors="Markus Neteler"
 LABEL maintainer="neteler@osgeo.org"
 
 # PACKAGES VERSIONS
-ARG GRASS_VERSION=7.7
+ARG GRASS_VERSION=7.8
 ARG PYTHON_VERSION=3
 ARG PROJ_VERSION=5.2.0
 ARG PROJ_DATUMGRID_VERSION=1.8

+ 1 - 1
docker/README_alpine.md

@@ -7,7 +7,7 @@ Download size of this image is only approximately 80 MB.
 Build the docker with:
 
 ```bash
-$ sudo docker build --build-arg GRASS_VERSION=7.7 \
+$ sudo docker build --build-arg GRASS_VERSION=7.8 \
                     --build-arg PYTHON_VERSION=3  \
                     --build-arg PROJ_VERSION=5.2.0 \
                     --build-arg PROJ_DATUMGRID_VERSION=1.8 \

+ 15 - 15
general/g.version/g.version.html

@@ -17,7 +17,7 @@ Library</a> can be printed by <b>-r</b> flag.
 
 <p>
 Version numbers of additional libraries
-like <a href="http://trac.osgeo.org/proj/">PROJ.4</a>, <a href="http://gdal.org/">GDAL/OGR</a>
+like <a href="https://proj.org/">PROJ</a>, <a href="http://gdal.org/">GDAL/OGR</a>
 or <a href="http://trac.osgeo.org/geos">GEOS</a> are printed
 by <b>-e</b> flag.
 
@@ -38,7 +38,7 @@ print gcore.version()
 <div class="code"><pre>
 g.version 
 
-GRASS 7.5.svn (2017)
+GRASS 7.8.dev (2019)
 </pre></div>
 
 <h3>GIS Library info</h3>
@@ -46,27 +46,27 @@ GRASS 7.5.svn (2017)
 <div class="code"><pre>
 g.version -r
 
-GRASS 7.5.svn (2017)
-libgis Revision: 70829 
-libgis Date: 2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017)
+GRASS 7.8.dev (2019)
+libgis Revision
+libgis Date
 </pre></div>
 
 <h3>Full info in shell script style</h3>
 <div class="code"><pre>
 g.version -rge
 
-version=7.5.svn
-date=2017
-revision=r71702M
-build_date=2017-11-12
+version=7.8.dev
+date=2019
+revision=d4879d401
+build_date=2019-08-04
 build_platform=x86_64-pc-linux-gnu
 build_off_t_size=8
-libgis_revision=70829 
-libgis_date="2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017) "
-proj4=4.9.3
-gdal=2.1.3
-geos=3.6.1
-sqlite=3.20.1
+libgis_revision=00000
+libgis_date="?"
+proj4=5.2.0
+gdal=2.3.2
+geos=3.7.1
+sqlite=3.26.0
 </pre></div>
 
 <h2>Citing GRASS GIS</h2>

+ 3 - 3
lib/python/script/setup.py

@@ -29,12 +29,12 @@ Usage::
         # MS Windows
         grass7bin = r'C:\OSGeo4W\bin\grass78.bat'
         # uncomment when using standalone WinGRASS installer
-        # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass78.bat'
+        # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.8.0\grass78.bat'
         # this can be avoided if GRASS executable is added to PATH
     elif sys.platform == 'darwin':
         # Mac OS X
         # TODO: this have to be checked, maybe unix way is good enough
-        grass7bin = '/Applications/GRASS/GRASS-7.7.app/'
+        grass7bin = '/Applications/GRASS/GRASS-7.8.app/'
 
     # query GRASS GIS itself for its GISBASE
     startcmd = [grass7bin, '--config', 'path']
@@ -81,7 +81,7 @@ Usage::
     gsetup.cleanup()
 
 
-(C) 2010-2012 by the GRASS Development Team
+(C) 2010-2019 by the GRASS Development Team
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
 for details.

+ 3 - 3
rpm/grass.spec

@@ -2,12 +2,12 @@
 # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
 %global _python_bytecompile_extra 1
 
-%global shortver 76
+%global shortver 78
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	7.6.0
-Release:	2%{?dist}
+Version:	7.8.0
+Release:	1%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?rhel}