Merge branch 'master' into gitarchive-exportignore

Author: RonnyPfannschmidt

.travis.yml

@@ -1,21 +1,20 @@
 language: python
 sudo: false
 python:
-- '2.6'
 - '2.7'
-- '3.3'
 - '3.4'
 - '3.5'
 - '3.6'
+#- '3.7'
 env:
 - TOXENV=py-test
 
 matrix:
   include:
-    - python: '2.7'
-      env: TOXENV=flake8
     - python: '3.5'
       env: TOXENV=flake8
+    - python: '3.5'
+      env: TOXENV=check_readme
     - python: '2.7'
       env: SELFINSTALL=1
     - python: '3.5'

CHANGELOG.rst

@@ -1,7 +1,9 @@
 v1.15.7
 ======
 
-* fix #174 by normalizing windows path using windows apis
+* Fix #174 with #207: Re-use samefile backport as developed in
+  jaraco.windows, and only use the backport where samefile is
+  not available.
 
 v1.15.6
 =======

README.rst

@@ -61,7 +61,7 @@ To use setuptools_scm just modify your project's setup.py file like this:
 Programmatic usage
 ------------------
 
-In order to use ``setuptools_scm`` from code that one directory deeper
+In order to use ``setuptools_scm`` from code that is one directory deeper
 than the project's root, you can use:
 
 .. code:: python

appveyor.yml

@@ -6,12 +6,6 @@ environment:
     - PYTHON: "C:\\Python27-x64"
       TOX_ENV: "py-test"
 
-    - PYTHON: "C:\\Python33"
-      TOX_ENV: "py-test"
-      
-    - PYTHON: "C:\\Python33-x64"
-      TOX_ENV: "py-test"
-
     - PYTHON: "C:\\Python34"
       TOX_ENV: "py-test"
 

setup.py

@@ -90,17 +90,18 @@ def parse(root):
 
         [setuptools_scm.local_scheme]
         node-and-date = setuptools_scm.version:get_local_node_and_date
+        node-and-timestamp = \
+        setuptools_scm.version:get_local_node_and_timestamp
         dirty-tag = setuptools_scm.version:get_local_dirty_tag
     """,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
@@ -109,6 +110,7 @@ def parse(root):
         'Topic :: System :: Software Distribution',
         'Topic :: Utilities',
     ],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
 )
 
 if __name__ == '__main__':

setuptools_scm/git.py

@@ -1,4 +1,4 @@
-from .utils import do_ex, trace, has_command, _normalized
+from .utils import do_ex, trace, has_command
 from .version import meta
 
 from os.path import isfile, join
@@ -7,6 +7,13 @@
 import tarfile
 import warnings
 
+
+try:
+    from os.path import samefile
+except ImportError:
+    from .win_py31_compat import samefile
+
+
 FILES_COMMAND = sys.executable + ' -m setuptools_scm.git'
 DEFAULT_DESCRIBE = 'git describe --dirty --tags --long --match *.*'
 
@@ -25,7 +32,7 @@ def from_potential_worktree(cls, wd):
         if ret:
             return
         trace('real root', real_wd)
-        if _normalized(real_wd) != _normalized(wd):
+        if not samefile(real_wd, wd):
             return
 
         return cls(real_wd)

setuptools_scm/hg.py

@@ -25,11 +25,11 @@ def _hg_tagdist_normalize_tagcommit(root, tag, dist, node):
 def parse(root):
     if not has_command('hg'):
         return
-    l = do('hg id -i -t', root).split()
-    if not l:
+    identity_data = do('hg id -i -t', root).split()
+    if not identity_data:
         return
-    node = l.pop(0)
-    tags = tags_to_versions(l)
+    node = identity_data.pop(0)
+    tags = tags_to_versions(identity_data)
     # filter tip in degraded mode on old setuptools
     tags = [x for x in tags if x != 'tip']
     dirty = node[-1] == '+'

setuptools_scm/utils.py

@@ -7,7 +7,6 @@
 import shlex
 import subprocess
 import os
-from os.path import abspath, normcase, realpath
 import io
 import platform
 
@@ -27,7 +26,7 @@ def ensure_stripped_str(str_or_bytes):
     if isinstance(str_or_bytes, str):
         return str_or_bytes.strip()
     else:
-        return str_or_bytes.decode('utf-8', 'surogate_escape').strip()
+        return str_or_bytes.decode('utf-8', 'surrogateescape').strip()
 
 
 def _always_strings(env_dict):
@@ -108,59 +107,3 @@ def has_command(name):
     if not res:
         warnings.warn("%r was not found" % name)
     return res
-
-
-def _normalized(path):
-    if IS_WINDOWS:
-        path = get_windows_long_path_name(path)
-    return normcase(abspath(realpath(path)))
-
-
-if IS_WINDOWS:
-    from ctypes import create_unicode_buffer, windll, WinError
-    from ctypes.wintypes import MAX_PATH, LPCWSTR, LPWSTR, DWORD
-
-    GetLongPathNameW = windll.kernel32.GetLongPathNameW
-    GetLongPathNameW.argtypes = [LPCWSTR, LPWSTR, DWORD]
-    GetLongPathNameW.restype = DWORD
-
-    def get_windows_long_path_name(path):
-        """
-        Converts the specified path from short (MS-DOS style) to long form
-        using the 'GetLongPathNameW' function from Windows API.
-
-        https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
-        """
-        if PY2:
-            # decode path using filesystem encoding on python2; on python3
-            # it is already a unicode string
-            path = unicode(path, sys.getfilesystemencoding())  # noqa
-
-        pathlen = MAX_PATH + 1
-        if DEBUG:
-            # test reallocation logic
-            pathlen = 1
-
-        for _ in range(2):
-            buf = create_unicode_buffer(pathlen)
-            retval = GetLongPathNameW(path, buf, pathlen)
-
-            if retval == 0:
-                # if the function fails for any reason (e.g. file does not
-                # exist), the return value is zero
-                raise WinError()
-
-            if retval <= pathlen:
-                # the function succeeded: the return value is the length of
-                # the string copied to the buffer
-                if PY2:
-                    # re-encode to native 'str' type (i.e. bytes) on python2
-                    return buf.value.encode(sys.getfilesystemencoding())
-                return buf.value
-
-            # if the buffer is too small to contain the result, the return
-            # value is the size of the buffer required to hold the path and
-            # the terminating NULL char; we retry using a large enough buffer
-            pathlen = retval
-
-        raise RuntimeError("Failed to get long path name: {!r}".format(path))

setuptools_scm/version.py

@@ -144,6 +144,20 @@ def get_local_node_and_date(version):
         return version.format_choice("+{node}", "+{node}.d{time:%Y%m%d}")
 
 
+def get_local_node_and_timestamp(version, fmt='%Y%m%d%H%M%S'):
+    if version.exact or version.node is None:
+        return version.format_choice("",
+                                     "+d{time:"
+                                     + "{fmt}".format(fmt=fmt)
+                                     + "}")
+    else:
+        return version.format_choice("+{node}",
+                                     "+{node}"
+                                     + ".d{time:"
+                                     + "{fmt}".format(fmt=fmt)
+                                     + "}")
+
+
 def get_local_dirty_tag(version):
     return version.format_choice('', '+dirty')