Release/2.4

.gitignore

@@ -13,3 +13,9 @@
 .cproject
 .idea
 .vscode
+.vs
+
+# Python
+__pycache__/
+.env*/
+.venv*/

.travis.yml

@@ -1,6 +1,10 @@
 # This is the config file for building GDAL and running its autotest suite
 # with Travis-ci.org
 
+branches:
+  except:
+  - /^(cherry-pick-)?backport-\d+-to-/
+
 matrix:
   fast_finish: true
   include:
@@ -88,13 +92,13 @@ matrix:
       compiler: gcc
       language: cpp
       sudo: required
-      dist: precise
+      dist: xenial
       cache:
         apt: true
         directories:
           - $HOME/.ccache
       env:
-        - BUILD_NAME=gcc52_stdcpp14_sanitize
+        - BUILD_NAME=sanitize
         - DETAILS=""
     - os: linux
       compiler: gcc
@@ -162,13 +166,13 @@ install:
 script:
   - ./gdal/ci/travis/${BUILD_NAME}/script.sh
 
-notifications:
-  email:
-    recipients:
-      - [email protected]
-
-  irc:
-    channels:
-      - "irc.freenode.org#gdal"
-    use_notice: true
-    on_success: change
+# notifications:
+#   email:
+#     recipients:
+#       - [email protected]
+#
+#   irc:
+#     channels:
+#       - "irc.freenode.org#gdal"
+#     use_notice: true
+#     on_success: change

CONTRIBUTING.md

@@ -21,7 +21,8 @@ gdalinfo --version
 Run autotest suite:
 ```
 cd ../autotest
-python run_all.py
+pip install -r requirements.txt
+pytest
 ```
 
 Git workflows with GDAL
@@ -83,7 +84,15 @@ git rebase origin/master
 
 # At end of your work, make sure history is reasonable by folding non
 # significant commits into a consistent set
-git rebase -i master (use fixup for example to merge several commits together)
+git rebase -i master (use 'fixup' for example to merge several commits together,
+and 'reword' to modify commit messages)
+
+# or alternatively, in case there is a big number of commits and marking
+# all them as 'fixup' is tedious
+git fetch origin
+git rebase origin/master
+git reset --soft origin/master
+git commit -a -m "Put here the synthetic commit message"
 
 # push your branch
 git push my_user_name my_new_feature_branch
@@ -103,7 +112,10 @@ Backporting bugfixes from master to a stable branch
 git checkout master
 With git log, identify the sha1sum of the commit you want to backport
 git checkout 2.2 (if you want to backport to 2.2)
+git pull origin 2.2
+(git checkout -b branh_name: if you intend to submit the backport as a pull request)
 git cherry-pick the_sha1_sum
+git push ...
 ```
 If changes are needed, do them and ```git commit -a --amend```
 

README.md

@@ -4,6 +4,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Build Status](https://travis-ci.com/OSGeo/gdal.svg?branch=master)](https://travis-ci.com/OSGeo/gdal)
 [![Build status](https://ci.appveyor.com/api/projects/status/jtwx0pcr0y01i17p/branch/master?svg=true)](https://ci.appveyor.com/project/OSGeo/gdal)
 [![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
+[gdalautotest coverage](https://gdalautotest-coverage-results.github.io/coverage_html/index.html)
 
 | Tested configurations    |
 | ------------------------ |

Vagrantfile

@@ -151,7 +151,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "mingw-w64-tools",
     "gdb-mingw-w64-target",
     "libgeos-mingw-w64-dev",
-    "libproj-mingw-w64-dev",
+    #"libproj-mingw-w64-dev",
     "cmake3-curses-gui",
     "gdb",
     "gdbserver",

appveyor.yml

@@ -1,4 +1,8 @@
 
+branches:
+  except:
+    - /(cherry-pick-)?backport-\d+-to-/
+
 environment:
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -63,7 +67,8 @@ install:
       Install-Module Pscx -AllowClobber
       Install-Module VSSetup -Scope CurrentUser
       # Install SWIG and VC for Python2.7 by Choco
-      cinst -y --no-progress swig vcpython27
+      cinst -y --no-progress --version 3.0.12 --force swig
+      cinst -y --no-progress vcpython27
       Import-VisualStudioVars -VisualStudioVersion $env:VS_VER -Architecture $env:ARCHITECTURE
       exec { pip install numpy }
       $env:SDK_ZIP="$env:SDK"+"-dev.zip"
@@ -105,10 +110,8 @@ install:
       $env:NMAKE_LOCAL+="LIBKML_LIBS=`$(SDK_LIB)\libkmlbase.lib `$(SDK_LIB)\libkmlconvenience.lib `$(SDK_LIB)\libkmldom.lib `$(SDK_LIB)\libkmlengine.lib `$(SDK_LIB)\libkmlregionator.lib `$(SDK_LIB)\libkmlxsd.lib `$(SDK_LIB)\expat.lib `$(SDK_LIB)\zdll.lib`n"
       $env:NMAKE_LOCAL+="POPPLER_ENABLED = YES`n"
       $env:NMAKE_LOCAL+="POPPLER_CFLAGS = -I`$(SDK_INC) -I`$(SDK_INC)\poppler`n"
-      $env:NMAKE_LOCAL+="POPPLER_HAS_OPTCONTENT = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_0_20_OR_LATER = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_0_23_OR_LATER = YES`n"
-      $env:NMAKE_LOCAL+="POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES`n"
+      $env:NMAKE_LOCAL+="POPPLER_MAJOR_VERSION = 0`n"
+      $env:NMAKE_LOCAL+="POPPLER_MINOR_VERSION = 30`n"
       $env:NMAKE_LOCAL+="POPPLER_LIBS = `$(SDK_LIB)\poppler.lib `$(SDK_LIB)\freetype.lib `$(SDK_LIB)\harfbuzz.lib advapi32.lib gdi32.lib`n"
       $env:NMAKE_LOCAL+="OPENJPEG_ENABLED = YES`n"
       $env:NMAKE_LOCAL+="OPENJPEG_CFLAGS = -I`$(SDK_INC)\openjpeg-2.1`n"
@@ -155,7 +158,8 @@ test_script:
       cd $env:APPVEYOR_BUILD_FOLDER\autotest\cpp
       exec { nmake /f makefile.vc check MSVC_VER=$env:MSVC_VER $env:WIN64_ARG }
       cd $env:APPVEYOR_BUILD_FOLDER\autotest
-      exec { python run_all.py }
+      exec { pip install -Ur requirements.txt }
+      exec { pytest -vv }
       cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\csharp
       exec { nmake /f makefile.vc test}
 

autotest/GNUmakefile

@@ -2,25 +2,25 @@ all:
 	@echo "Run 'make -j test'"
 
 gcore-test:
-	python run_all.py gcore
+	pytest gcore
 
 gdrivers-test:
-	python run_all.py gdrivers
+	pytest gdrivers
 
 alg-test:
-	python run_all.py alg
+	pytest alg
 
 osr-test:
-	python run_all.py osr
+	pytest osr
 
 ogr-test:
-	python run_all.py ogr
+	pytest ogr
 
 utilities-test:
-	python run_all.py utilities
+	pytest utilities
 
 pyscripts-test:
-	python run_all.py pyscripts
+	pytest pyscripts
 
 test check:
 	@$(MAKE) $(MFLAGS) gcore-test gdrivers-test alg-test ogr-test osr-test utilities-test pyscripts-test

autotest/README.md

@@ -0,0 +1,56 @@
+# GDAL test suite
+
+
+## How to run tests
+
+1. You need to install `pytest` to run the test suite. This should do it:
+
+```bash
+cd autotest
+pip install -r ./requirements.txt
+```
+
+2. Then, run tests with:
+
+```bash
+pytest
+```
+
+3. Some quick usage tips:
+
+```bash
+# get more verbose output; don't capture stdout/stdin
+pytest -vvs
+
+# run all the gcore tests
+pytest gcore/
+
+# run a particular module only
+pytest gcore/basic_test.py
+```
+
+
+## GDAL's tests are not independent
+
+GDAL's test functions are not currently independent of each other. In particular, running individual test functions from a given module may not work. Most tests were originally written with the assumption that entire modules will be run at once.
+
+Practically, this means that you should avoid using:
+
+
+* pytest's `--last-failed` / `--lf` option (since it runs only failed tests, not the whole module)
+* test specifiers that run individual tests (e.g. `pytest gcore/basic_test.py::test_basic_test_1` )
+* the xunit plugin to run tests in parallel, unless you also use `--dist=loadfile`. (This may have other issues; untested)
+
+This will hopefully be addressed in the future. When writing new tests, please try to make them independent of each other.
+
+
+## Notes about availability of GDAL sample and test data
+
+The GDAL Team makes every effort to assure that all sample data files
+available from GDAL download server (http://download.osgeo.org/gdal/data/) and
+test data files used in GDAL Autotest package (https://github.com/OSGeo/gdal/tree/master/autotest)
+are available as public and freely redistributable geodata.
+
+--
+
+http://gdal.org/