update appveyor build

Author: snowman2

appveyor.yml

@@ -1,3 +1,6 @@
+platform:
+- x64
+
 # This is based on file and files in ci/appveyor are from 
 # https://github.com/ogrisel/python-appveyor-demo
 environment:
@@ -13,57 +16,57 @@ environment:
     # build is limited to 60 minutes, without caching each build takes 10-30 minutes
     # with caching build takes less than 1 minute
 
-     # Python 2.6 will need to run this `pip install unittest2`
-#    - PYTHON: "C:\\Python26"
-#      PYTHON_VERSION: "2.6.x"
-#      PYTHON_ARCH: "32"
-
-#    - PYTHON: "C:\\Python26-x64"
-#      PYTHON_VERSION: "2.6.x"
-#      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "64"
-
-#    - PYTHON: "C:\\Python33"
-#      PYTHON_VERSION: "3.3.x"
-#      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
+      VS_VERSION: Visual Studio 14
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
-#    - PYTHON: "C:\\Python34"
-#      PYTHON_VERSION: "3.4.x"
-#      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x"
-      PYTHON_ARCH: "64"
-      
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "64"
+shallow_clone: true
 
 cache:
     - C:\Users\appveyor\AppData\Local\pip\Cache\wheels
 
+build_script:
+  # setup sqlite3
+  - vcpkg install sqlite3:"%platform%"-windows
+  - set SQLITE3_BIN=%APPVEYOR_BUILD_FOLDER%\sqlite3\bin
+  - mkdir %SQLITE3_BIN%
+  - copy c:\tools\vcpkg\installed\"%platform%"-windows\bin\sqlite3.dll %SQLITE3_BIN%
+  - ps: |
+        appveyor DownloadFile https://sqlite.org/2018/sqlite-tools-win32-x86-3250100.zip
+        7z x sqlite-tools-win32-x86-3250100.zip
+  - copy "%APPVEYOR_BUILD_FOLDER%"\sqlite-tools-win32-x86-3250100\sqlite3.exe %SQLITE3_BIN%
+  - set PATH=%PATH%;%SQLITE3_BIN%
+  # setup PROJ.4
+  - git clone https://github.com/OSGeo/proj.4.git
+  - cd proj.4/data
+  - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip
+  - 7z e -aoa -y proj-datumgrid-1.7.zip
+  - cd "%APPVEYOR_BUILD_FOLDER%"\proj.4
+  - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
+  - if "%platform%" == "x64" SET BUILD_LIBPROJ_SHARED=ON
+  - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
+  - if "%platform%" == "x86" SET BUILD_LIBPROJ_SHARED=OFF
+  - echo "%VS_FULL%"
+#
+  - mkdir "build_%platform%"
+  - cd "build_%platform%"
+  - set PROJ_DIR=%APPVEYOR_BUILD_FOLDER%\proj_dir
+  - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
+  - cmake --build . --config Release --target install
+  - set PATH=%PATH%;%PROJ_DIR%\bin
+  - set PROJ_DATA=%PROJ_DIR%\share
+  - proj
+  # Build and install pyproj
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - set PYPROJ_FULL_COVERAGE=YES
+  - "%CMD_IN_ENV% pip install -e ."
+
 install:
   - ECHO "Filesystem root:"
   - ps: "ls \"C:/\""
 
-  - ECHO "Installed SDKs:"
-  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
-
   # Install Python (from the official .msi of http://python.org) and pip when
   # not already installed.
   # - ps: if (-not(Test-Path($env:PYTHON))) { & ci\appveyor\install.ps1 }
@@ -90,14 +93,8 @@ install:
   # target Python version and architecture
   - "%CMD_IN_ENV% pip install -r requirements-dev.txt"
 
-build_script:
-  # Build and install pyproj
-  # - "%CMD_IN_ENV% python setup.py install"
-  - "%CMD_IN_ENV% pip install ."
-
 test_script:
   # Run the project tests
-  - "%CMD_IN_ENV% python lib/pyproj/__init__.py"
   - "%CMD_IN_ENV% python -c \"import pyproj; pyproj.Proj(init='epsg:4269')\""
   - "%CMD_IN_ENV% python unittest/test.py -v"
 

pyproj/_proj.pyx

@@ -336,7 +336,7 @@ def _transform(p1, p2, inx, iny, inz):
     cdef int errno = proj_errno(pj_trans.projpj)
     if errno:
         raise ProjError("proj_trans_generic error: {}".format(
-            proj_errno_string(errno)))
+            pystrdecode(proj_errno_string(errno))))
     if proj_angular_output(pj_trans.projpj, PJ_FWD):
         for i from 0 <= i < npts:
             xx[i] = xx[i]*_RAD2DG

pyproj/datadir.py

@@ -4,9 +4,12 @@
 import os
 
 if "PROJ_DATA" not in os.environ:
-    pyproj_datadir = os.path.join(
-        os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
-    )
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    pyproj_datadir = os.path.join(base_dir, "proj_dir", "share", "proj")
+    if not os.path.exists(pyproj_datadir):
+        pyproj_datadir = os.path.join(base_dir, "proj_dir", "share")
+    if not os.path.exists(pyproj_datadir):
+        raise RuntimeError("PROJ_DATA directory not found. Please set PROJ_DATA.")
     os.environ["PROJ_DATA"] = pyproj_datadir
 else:
     pyproj_datadir = os.environ["PROJ_DATA"]

requirements-dev.txt

@@ -1,7 +1,5 @@
-numpy
 cython>=0.28.4
 nose2
 pytest
 cov-core
-coverage>=4.0
-pyproj
+coverage>=4.0

setup.py

@@ -1,5 +1,6 @@
 from __future__ import with_statement
 
+from glob import glob
 import os
 import sys
 from distutils.spawn import find_executable
@@ -24,7 +25,12 @@
 
 def check_proj_version(proj_dir):
     proj = os.path.join(proj_dir, "bin", "proj")
-    proj_version = subprocess.check_output([proj], stderr=subprocess.STDOUT)
+    try:
+        proj_version = subprocess.check_output([proj], stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError:
+        if os.name == "nt":
+            return
+        raise
     proj_version = proj_version.split()[1].split(b".")
     proj_version = tuple(int(v.strip(b",")) for v in proj_version)
     if proj_version < PROJ_MIN_VERSION:
@@ -58,7 +64,7 @@ def check_proj_version(proj_dir):
 elif proj_dir is not None and os.path.exists(proj_dir):
     print("PROJ_DIR is set, using existing proj4 installation..\n")
 else:
-    sys.exit("ERROR: Invalid path for PROJ_DIR")
+    sys.exit("ERROR: Invalid path for PROJ_DIR {}".format(proj_dir))
 
 # check_proj_version
 check_proj_version(proj_dir)
@@ -73,24 +79,41 @@ def check_proj_version(proj_dir):
 proj_libdir = os.environ.get("PROJ_LIBDIR")
 libdirs = []
 if proj_libdir is None:
-    libdirs.append(os.path.join(proj_dir, "lib"))
-    libdirs.append(os.path.join(proj_dir, "lib64"))
+    if os.path.exists(os.path.join(proj_dir, "lib")):
+        libdirs.append(os.path.join(proj_dir, "lib"))
+        libdirs.append(os.path.join(proj_dir, "lib64"))
+    elif os.path.exists(os.path.join(proj_dir, "local", "lib")):
+        libdirs.append(os.path.join(proj_dir, "local", "lib"))
+    else:
+        sys.exit("ERROR: PROJ_LIBDIR dir not found. Please set PROJ_LIBDIR.")
 else:
     libdirs.append(proj_libdir)
 
 proj_incdir = os.environ.get("PROJ_INCDIR")
 incdirs = []
 if proj_incdir is None:
-    incdirs.append(os.path.join(proj_dir, "include"))
+    if os.path.exists(os.path.join(proj_dir, "include")):
+        incdirs.append(os.path.join(proj_dir, "include"))
+    elif os.path.exists(os.path.join(proj_dir, "local", "include")):
+        incdirs.append(os.path.join(proj_dir, "local", "include"))
+    else:
+        sys.exit("ERROR: PROJ_INCDIR dir not found. Please set PROJ_INCDIR.")
 else:
-    libdirs.append(proj_incdir)
-
+    incdirs.append(proj_incdir)
+
+libraries = ["proj"]
+if os.name == "nt":
+    for libdir in libdirs:
+        projlib = glob(os.path.join(libdir, "proj*.lib"))
+        if projlib:
+            libraries = [os.path.basename(projlib[0]).split(".lib")[0]]
+            break
 
 ext_options = dict(
     include_dirs=incdirs,
     library_dirs=libdirs,
-    runtime_library_dirs=libdirs,
-    libraries=["proj"],
+    runtime_library_dirs=libdirs if os.name != "nt" else None,
+    libraries=libraries,
 )
 
 ext_modules = cythonize(