fix __version_git versioining

gilesknap · Feb 10, 2020 · d098b2c · d098b2c
1 parent 38b1237
commit d098b2c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*/_version_git.py export-subst
diff --git a/gphotos/_version_git.py b/gphotos/_version_git.py
@@ -1,7 +1,7 @@
 # Compute a version number from a git repo or archive
 
 # This file is released into the public domain. Generated by:
-# versiongit-0.1+31.a44853a (https://github.com/dls-controls/versiongit)
+# versiongit-0.1+66.e5e165d (https://github.com/dls-controls/versiongit)
 import os
 import re
 from subprocess import check_output, STDOUT
@@ -43,6 +43,7 @@ def get_version_from_git(path=None):
                 # No tag, just sha1
                 plus, sha1 = "untagged", out
     # Replace dashes in tag for dots
+    # Remove this line when we stop supporting python 2.7
     tag = tag.replace("-", ".")
     if plus != "0" or dirty:
         # Not on a tag, add additional info

diff --git a/test/test_credentials/.gphotos.token b/test/test_credentials/.gphotos.token
@@ -1 +1 @@
-{"access_token": "ya29.ImG8B95EQiBKbUHQULndtrp8IEQZpHhg6bJ4h_ZdMt2gXKI_80-nlIWCErIIZ18Le9ie-IvzjQwwCVFBGI2MvL6MEB-ml4rpUqj264l2O5a0sGH0uzZJdcsuA6iijJavoJx9", "expires_in": 3599, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1580689512.2334697, "refresh_token": "1//03RScSJb3QlT_CgYIARAAGAMSNwF-L9IrGYvHJGx8gkwwgr_UpJW4e_HUM9-4jOvk_C2HI06R1GnXoH7yNt8vd5F4_7OVvrqkxl8"}
+{"access_token": "ya29.ImG9B5GZTuFrX38cxQVK0xe54xOMh_cNzrCM4JXqIafmXXKNDlbQr3hug2wiIBPs5rGizisEcWIpEI3lb4J2XCBebX3sYDextTcSjxlgcKoQHnVMjUC8Ld0QS95ZdV8QzAeL", "expires_in": 3599, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1581359304.3966794, "refresh_token": "1//03RScSJb3QlT_CgYIARAAGAMSNwF-L9IrGYvHJGx8gkwwgr_UpJW4e_HUM9-4jOvk_C2HI06R1GnXoH7yNt8vd5F4_7OVvrqkxl8"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"access_token": "ya29.ImG8B95EQiBKbUHQULndtrp8IEQZpHhg6bJ4h_ZdMt2gXKI_80-nlIWCErIIZ18Le9ie-IvzjQwwCVFBGI2MvL6MEB-ml4rpUqj264l2O5a0sGH0uzZJdcsuA6iijJavoJx9", "expires_in": 3599, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1580689512.2334697, "refresh_token": "1//03RScSJb3QlT_CgYIARAAGAMSNwF-L9IrGYvHJGx8gkwwgr_UpJW4e_HUM9-4jOvk_C2HI06R1GnXoH7yNt8vd5F4_7OVvrqkxl8"}
		{"access_token": "ya29.ImG9B5GZTuFrX38cxQVK0xe54xOMh_cNzrCM4JXqIafmXXKNDlbQr3hug2wiIBPs5rGizisEcWIpEI3lb4J2XCBebX3sYDextTcSjxlgcKoQHnVMjUC8Ld0QS95ZdV8QzAeL", "expires_in": 3599, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1581359304.3966794, "refresh_token": "1//03RScSJb3QlT_CgYIARAAGAMSNwF-L9IrGYvHJGx8gkwwgr_UpJW4e_HUM9-4jOvk_C2HI06R1GnXoH7yNt8vd5F4_7OVvrqkxl8"}