Fix WIN10 filepath to store as posix and fetch as user's platform.

.travis.yml

@@ -70,4 +70,3 @@ jobs:
       script:
         - sudo pip install python-coveralls
         - coveralls
->>>>>>> bff58baac8da58b43be95ba1c58174cb7721411f

datajoint/external.py

@@ -74,7 +74,7 @@ def s3(self):
 
     def _make_external_filepath(self, relative_filepath):
         """resolve the complete external path based on the relative path"""
-        return PurePosixPath(self.spec['location'], relative_filepath)
+        return PurePosixPath(Path(self.spec['location']), relative_filepath)
 
     def _make_uuid_path(self, uuid, suffix=''):
         """create external path based on the uuid hash"""
@@ -211,7 +211,7 @@ def upload_filepath(self, local_filepath):
         """
         local_filepath = Path(local_filepath)
         try:
-            relative_filepath = str(local_filepath.relative_to(self.spec['stage']))
+            relative_filepath = str(local_filepath.relative_to(self.spec['stage']).as_posix())
         except ValueError:
             raise DataJointError('The path {path} is not in stage {stage}'.format(
                 path=local_filepath.parent, **self.spec)) from None

tests/__init__.py

@@ -113,7 +113,7 @@ def setup_package():
 
     # Add old MySQL
     source = Path(
-        os.path.dirname(os.path.realpath(__file__)),
+        Path(__file__).resolve().parent,
         'external-legacy-data')
     db_name = "djtest_blob_migrate"
     db_file = "v0_11.sql"
@@ -127,7 +127,7 @@ def setup_package():
 
     # Add old S3
     source = Path(
-        os.path.dirname(os.path.realpath(__file__)),
+        Path(__file__).resolve().parent,
         'external-legacy-data','s3')
     bucket = "migrate-test"
     region = "us-east-1"
@@ -152,9 +152,9 @@ def setup_package():
     # Add old File Content
     try:
         shutil.copytree(
-                Path(os.path.dirname(os.path.realpath(__file__)),
-                'external-legacy-data','file','temp'),
-                Path(os.path.expanduser('~'),'temp'))
+            Path(Path(__file__).resolve().parent,
+            'external-legacy-data','file','temp'),
+            Path(os.path.expanduser('~'),'temp'))
     except FileExistsError:
         pass
 

tests/test_filepath.py

@@ -10,6 +10,36 @@
 def setUp(self):
     dj.config['stores'] = stores_config
 
+def test_path_match(store="repo"):
+    """ test file path matches and empty file"""
+    ext = schema.external[store]
+    stage_path = dj.config['stores'][store]['stage']
+
+    # create a mock file
+    relpath = 'path/to/films'
+    managed_file = Path(stage_path, relpath, 'vid.mov')
+    managed_file.parent.mkdir(parents=True, exist_ok=True)
+    open(managed_file, 'a').close()
+
+    # put the file
+    uuid = ext.upload_filepath(managed_file)
+
+    #remove
+    managed_file.unlink()
+    assert_false(managed_file.exists())
+
+    #check filepath
+    assert_equal(
+        (ext & {'hash': uuid}).fetch1('filepath'),
+        str(managed_file.relative_to(stage_path).as_posix()))
+
+    # # Download the file and check its contents.
+    restored_path, checksum = ext.download_filepath(uuid)
+    assert_equal(restored_path, managed_file)
+    assert_equal(checksum, dj.hash.uuid_from_file(managed_file))
+
+    # cleanup
+    ext.delete(delete_external_files=True)
 
 def test_filepath(store="repo"):
     """ test file management """