Skip to content

Commit 71c0fa8

Browse files
committed
FIX Tell git which filetypes are binaries
So that Unix line endings do not get replaced by CRLF line endings on Windows systems. Solves issue with TestSpeStack on Windows.
1 parent 0ae44ab commit 71c0fa8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
trackpy/_version.py export-subst
22
pims/_version.py export-subst
3+
*.pkl binary
4+
*.spe binary
5+
*.tif binary
6+
*.mov binary
7+
*.seq binary
8+
*.nd2 binary

pims/tests/test_common.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,6 @@ def test_metadata(self):
722722
d = pickle.load(p)
723723
else:
724724
d = pickle.load(p, encoding="latin1")
725-
# unpickling fails on Py3.4, Win7, 64-bit:
726-
# UnpicklingError: the STRING opcode argument must be quoted
727-
728725
#spare4 is actually a byte array
729726
d["spare4"] = d["spare4"].encode("latin1")
730727

0 commit comments

Comments
 (0)