[GRASS-SVN] r64157 - in grass/branches/releasebranch_7_0: . temporal/t.connect/testsuite testsuite/raster
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 13 22:08:03 PST 2015
Author: wenzeslaus
Date: 2015-01-13 22:08:03 -0800 (Tue, 13 Jan 2015)
New Revision: 64157
Modified:
grass/branches/releasebranch_7_0/REQUIREMENTS.html
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
grass/branches/releasebranch_7_0/testsuite/raster/raster_md5test.sh
grass/branches/releasebranch_7_0/testsuite/raster/rhemisphere.sh
Log:
remove minor differences to r64155 trunk (probably due to improper backports)
Modified: grass/branches/releasebranch_7_0/REQUIREMENTS.html
===================================================================
--- grass/branches/releasebranch_7_0/REQUIREMENTS.html 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/REQUIREMENTS.html 2015-01-14 06:08:03 UTC (rev 64157)
@@ -149,7 +149,7 @@
<a href="http://labix.org/python-dateutil">http://labix.org/python-dateutil</a>
</li>
-<li><b>Python PLY Library</b> ("python-ply", needed for the temporal algebra in tgis)<br>
+<li><b>Python PLY Library (Python Lex-Yacc)</b> ("python-ply", needed for the temporal algebra in tgis)<br>
<a href="http://www.dabeaz.com/ply">http://www.dabeaz.com/ply</a>
</li>
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2015-01-14 06:08:03 UTC (rev 64157)
@@ -215,7 +215,6 @@
tinfo_string="""id=a1 at test1
name=a1
mapset=test1
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
@@ -226,7 +225,6 @@
tinfo_string="""id=a1 at test2
name=a1
mapset=test2
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
@@ -237,7 +235,6 @@
tinfo_string="""id=a1 at test3
name=a1
mapset=test3
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
@@ -248,7 +245,6 @@
tinfo_string="""id=a1 at test4
name=a1
mapset=test4
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2015-01-14 06:08:03 UTC (rev 64157)
@@ -161,7 +161,6 @@
tinfo_string="""id=a1 at test3d1
name=a1
mapset=test3d1
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
@@ -172,7 +171,6 @@
tinfo_string="""id=a1 at test3d2
name=a1
mapset=test3d2
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
@@ -183,7 +181,6 @@
tinfo_string="""id=a1 at test3d3
name=a1
mapset=test3d3
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
@@ -194,7 +191,6 @@
tinfo_string="""id=a1 at test3d4
name=a1
mapset=test3d4
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
Modified: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2015-01-14 06:08:03 UTC (rev 64157)
@@ -171,7 +171,6 @@
tinfo_string="""id=a1 at testvect1
name=a1
mapset=testvect1
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-02-01 00:00:00 """
@@ -182,7 +181,6 @@
tinfo_string="""id=a1 at testvect2
name=a1
mapset=testvect2
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-03-01 00:00:00 """
@@ -193,7 +191,6 @@
tinfo_string="""id=a1 at testvect3
name=a1
mapset=testvect3
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-04-01 00:00:00 """
@@ -204,7 +201,6 @@
tinfo_string="""id=a1 at testvect4
name=a1
mapset=testvect4
- creator=soeren
temporal_type=absolute
start_time=2001-01-01 00:00:00
end_time=2001-05-01 00:00:00 """
Modified: grass/branches/releasebranch_7_0/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/branches/releasebranch_7_0/testsuite/raster/raster_md5test.sh 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/testsuite/raster/raster_md5test.sh 2015-01-14 06:08:03 UTC (rev 64157)
@@ -48,7 +48,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove -f type=rast name=$TMPNAME > /dev/null
+ g.remove -f type=raster name=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -68,7 +68,7 @@
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove -f type=rast name=MASK > /dev/null
+ g.remove -f type=raster name=MASK > /dev/null
g.rename raster=$USERMASK,MASK > /dev/null
fi
}
Modified: grass/branches/releasebranch_7_0/testsuite/raster/rhemisphere.sh
===================================================================
--- grass/branches/releasebranch_7_0/testsuite/raster/rhemisphere.sh 2015-01-14 06:06:28 UTC (rev 64156)
+++ grass/branches/releasebranch_7_0/testsuite/raster/rhemisphere.sh 2015-01-14 06:08:03 UTC (rev 64157)
@@ -24,7 +24,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove --q -f type=rast name=$TMP > /dev/null
+ g.remove --q -f type=raster name=$TMP > /dev/null
}
########################
More information about the grass-commit
mailing list