Update validate data for new data organization

Author: matthew-brett

scripts/validate_data.py

@@ -5,11 +5,10 @@
     python3 scripts/validata_data.py data
 """
 
-import os.path as op
+import op as op
 import sys
 import hashlib
 
-
 def file_hash(filename):
     """ Get byte contents of file `filename`, return SHA1 hash
 
@@ -25,11 +24,13 @@ def file_hash(filename):
     """
     # Open the file, read contents as bytes.
     # Calculate, return SHA1 has on the bytes from the file.
-    raise NotImplementedError('This is just a template -- you are expected to code this.')
+    # This is a placeholder, replace it to write your solution.
+    raise NotImplementedError(
+        'This is just a template -- you are expected to code this.')
 
 
 def validate_data(data_directory):
-    """ Read ``data_hashes.txt`` file in ``data_directory``, check hashes
+    """ Read ``data_hashes.txt`` file in `data_directory`, check hashes
 
     Parameters
     ----------
@@ -51,6 +52,7 @@ def validate_data(data_directory):
     # Calculate actual hash for given filename.
     # If hash for filename is not the same as the one in the file, raise
     # ValueError
+    # This is a placeholder, replace it to write your solution.
     raise NotImplementedError('This is just a template -- you are expected to code this.')
 
 

solutions/.solutions.toml

@@ -0,0 +1,4 @@
+# Where the exercises etc go, given the solutions
+
+[solution.validate_data]
+out_path = '{one_down}/scripts/validate_data.py'

solutions/validate_data.py

@@ -9,6 +9,7 @@
 import sys
 import hashlib
 
+
 def file_hash(filename):
     """ Get byte contents of file `filename`, return SHA1 hash
 
@@ -24,9 +25,15 @@ def file_hash(filename):
     """
     # Open the file, read contents as bytes.
     # Calculate, return SHA1 has on the bytes from the file.
+    # LAB(begin solution)
     with open(filename, 'rb') as fobj:
         contents = fobj.read()
     return hashlib.sha1(contents).hexdigest()
+    # LAB(replace solution)
+    # This is a placeholder, replace it to write your solution.
+    raise NotImplementedError(
+        'This is just a template -- you are expected to code this.')
+    # LAB(end solution)
 
 
 def validate_data(data_directory):
@@ -48,6 +55,11 @@ def validate_data(data_directory):
         ``data_hashes.txt`` file.
     """
     # Read lines from ``data_hashes.txt`` file.
+    # Split into SHA1 hash and filename
+    # Calculate actual hash for given filename.
+    # If hash for filename is not the same as the one in the file, raise
+    # ValueError
+    # LAB(begin solution)
     for line in open(op.join(data_directory, 'data_hashes.txt'), 'rt'):
         # Split into SHA1 hash and filename
         hash, filename = line.strip().split()
@@ -57,6 +69,10 @@ def validate_data(data_directory):
         # ValueError
         if hash != actual_hash:
             raise ValueError("Hash for {} does not match".format(filename))
+    # LAB(replace solution)
+    # This is a placeholder, replace it to write your solution.
+    raise NotImplementedError('This is just a template -- you are expected to code this.')
+    # LAB(end solution)
 
 
 def main():