Merge 0988740 into staging

rtmigo · Mar 9, 2022 · 7a2e09f · 7a2e09f
2 parents 63be2af + 0988740
commit 7a2e09f
Show file tree

Hide file tree

Showing 83 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ 3.7, 3.8, 3.9 ] # 3.10.0-beta.1
+        python-version: [ 3.7, 3.8, 3.9, '3.10' ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/dmk/__init__.py b/dmk/__init__.py
diff --git a/dmk/_cli.py b/dmk/_cli.py
diff --git a/dmk/_common.py b/dmk/_common.py
diff --git a/dmk/_constants.py b/dmk/_constants.py
diff --git a/dmk/_main.py b/dmk/_main.py
diff --git a/dmk/_vault_file.py b/dmk/_vault_file.py
diff --git a/dmk/a_base/_05_codename.py b/dmk/a_base/_05_codename.py
diff --git a/dmk/a_base/_10_kdf.py b/dmk/a_base/_10_kdf.py
diff --git a/dmk/a_base/__init__.py b/dmk/a_base/__init__.py
diff --git a/dmk/a_utils/__init__.py b/dmk/a_utils/__init__.py
diff --git a/dmk/a_utils/bytes.py b/dmk/a_utils/bytes.py
diff --git a/dmk/a_utils/dirty_file.py b/dmk/a_utils/dirty_file.py
diff --git a/dmk/a_utils/randoms.py b/dmk/a_utils/randoms.py
diff --git a/dmk/a_utils/shred.py b/dmk/a_utils/shred.py
diff --git a/dmk/b_cryptoblobs/_10_byte_funcs.py b/dmk/b_cryptoblobs/_10_byte_funcs.py
@@ -32,13 +32,13 @@ def bytes_to_uint24(data: bytes) -> int:
         raise ValueError
     return int.from_bytes(data, byteorder='big', signed=False)
 
+
 def bytes_to_uint48(data: bytes) -> int:
     if len(data) != 6:
         raise ValueError
     return int.from_bytes(data, byteorder='big', signed=False)
 
 
-
 def bytes_to_int64(data: bytes) -> int:
     if len(data) != 8:
         raise ValueError

diff --git a/dmk/b_cryptoblobs/_20_encdec_part.py b/dmk/b_cryptoblobs/_20_encdec_part.py
diff --git a/dmk/b_cryptoblobs/_30_encdec_multipart.py b/dmk/b_cryptoblobs/_30_encdec_multipart.py
diff --git a/dmk/b_cryptoblobs/__init__.py b/dmk/b_cryptoblobs/__init__.py
diff --git a/dmk/b_storage_file/_10_fragment_io.py b/dmk/b_storage_file/_10_fragment_io.py
diff --git a/dmk/b_storage_file/_20_blocks_rw.py b/dmk/b_storage_file/_20_blocks_rw.py
diff --git a/dmk/b_storage_file/_30_storage_file.py b/dmk/b_storage_file/_30_storage_file.py
diff --git a/dmk/b_storage_file/__init__.py b/dmk/b_storage_file/__init__.py
diff --git a/dmk/c_namegroups/__init__.py b/dmk/c_namegroups/__init__.py
diff --git a/dmk/c_namegroups/_fakes.py b/dmk/c_namegroups/_fakes.py
diff --git a/dmk/c_namegroups/_namegroup.py b/dmk/c_namegroups/_namegroup.py
diff --git a/dmk/c_namegroups/_update.py b/dmk/c_namegroups/_update.py
diff --git a/dmk/c_namegroups/content_ver.py b/dmk/c_namegroups/content_ver.py
diff --git a/experiments/__init__.py b/experiments/__init__.py
diff --git a/experiments/bench_blake_hash_sizes.py b/experiments/bench_blake_hash_sizes.py
diff --git a/experiments/bench_chacha_vs_blake.py b/experiments/bench_chacha_vs_blake.py
diff --git a/experiments/bench_get_random_bytes.py b/experiments/bench_get_random_bytes.py
diff --git a/experiments/exp.py b/experiments/exp.py
diff --git a/experiments/exp_checksum_in_encoded.py b/experiments/exp_checksum_in_encoded.py
diff --git a/lint.py b/lint.py
@@ -2,18 +2,18 @@
 
 
 def lint():
-
     # pip3 install --upgrade setuptools pip distlib
 
-    print("Running pylint...")
-    r = subprocess.call(['pylint', 'dmk'])
-    if r & 1 or r & 2 or r & 32:
-        exit(1)
+    # print("Running pylint...")
+    # r = subprocess.call(['pylint', 'dmk'])
+    # if r & 1 or r & 2 or r & 32:
+    #     exit(1)
 
     print("Running mypy...")
     if subprocess.call(['mypy', 'dmk',
                         '--ignore-missing-imports']) != 0:
         exit(1)
 
+
 if __name__ == "__main__":
-    lint()
+    lint()
diff --git a/mypy.ini b/mypy.ini
diff --git a/pylintrc b/pylintrc
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -48,17 +48,15 @@ def load_module_dict(filename: str) -> dict:
              "".split(),
 
     classifiers=[
-        #"Development Status :: 4 - Beta",
-        #"Intended Audience :: Developers",
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: BSD License',
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         'Topic :: Security :: Cryptography',
         "Environment :: Console",
         "Typing :: Typed",
-        #"Topic :: Software Development :: Build Tools",
         "Operating System :: POSIX",
         "Operating System :: Microsoft :: Windows"
     ],

diff --git a/test_pkg.py b/test_pkg.py
diff --git a/test_unit.py b/test_unit.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/common.py b/tests/common.py
diff --git a/tests/data/ref_vault.dmk b/tests/data/ref_vault.dmk
diff --git a/tests/data_refs/2crq2uw2xwea b/tests/data_refs/2crq2uw2xwea
diff --git a/tests/data_refs/4b65zkdiyewig b/tests/data_refs/4b65zkdiyewig
diff --git a/tests/data_refs/5bp2u b/tests/data_refs/5bp2u
diff --git a/tests/data_refs/6cxd7qsoue2uy b/tests/data_refs/6cxd7qsoue2uy
diff --git a/tests/data_refs/6yb2rbrh63pq b/tests/data_refs/6yb2rbrh63pq
diff --git a/tests/data_refs/dc5uxi4qrcmxwwy b/tests/data_refs/dc5uxi4qrcmxwwy
diff --git a/tests/data_refs/el6vtqi b/tests/data_refs/el6vtqi
diff --git a/tests/data_refs/g3zapijnsz256yakmm b/tests/data_refs/g3zapijnsz256yakmm
diff --git a/tests/data_refs/g53a b/tests/data_refs/g53a
diff --git a/tests/data_refs/gnels243gzj4di6tdu b/tests/data_refs/gnels243gzj4di6tdu
diff --git a/tests/data_refs/j3723g4d6winqnep b/tests/data_refs/j3723g4d6winqnep
diff --git a/tests/data_refs/j5a253qsju b/tests/data_refs/j5a253qsju
diff --git a/tests/data_refs/j5l6atkcqclfct5gbm b/tests/data_refs/j5l6atkcqclfct5gbm
diff --git a/tests/data_refs/midwj6rg6pdgpay b/tests/data_refs/midwj6rg6pdgpay
diff --git a/tests/data_refs/ozotxbjsvcflk5gaoq b/tests/data_refs/ozotxbjsvcflk5gaoq
diff --git a/tests/data_refs/qz35kupadj24f2ku b/tests/data_refs/qz35kupadj24f2ku
diff --git a/tests/data_refs/tt74nrjh54 b/tests/data_refs/tt74nrjh54
diff --git a/tests/data_refs/tynm4oi6na2uoxd6 b/tests/data_refs/tynm4oi6na2uoxd6
diff --git a/tests/test_blob_name_group.py b/tests/test_blob_name_group.py
diff --git a/tests/test_blobs_update.py b/tests/test_blobs_update.py
diff --git a/tests/test_blocks.py b/tests/test_blocks.py
diff --git a/tests/test_byte_funcs.py b/tests/test_byte_funcs.py
diff --git a/tests/test_cli.py b/tests/test_cli.py
diff --git a/tests/test_content_ver.py b/tests/test_content_ver.py
diff --git a/tests/test_encdec_multipart.py b/tests/test_encdec_multipart.py
diff --git a/tests/test_encrypt_part.py b/tests/test_encrypt_part.py
diff --git a/tests/test_io_fragment.py b/tests/test_io_fragment.py
diff --git a/tests/test_kdf.py b/tests/test_kdf.py
diff --git a/tests/test_parse_nunits.py b/tests/test_parse_nunits.py
diff --git a/tests/test_random_names.py b/tests/test_random_names.py
diff --git a/tests/test_randoms.py b/tests/test_randoms.py
diff --git a/tests/test_reference.py b/tests/test_reference.py
@@ -37,12 +37,12 @@ def generate_references():
             d.set_from_io(name, input_io)
         print(f"Written in {time.monotonic() - t}")
 
-#@unittest.skip('tmp')
+
 class TestRefs(unittest.TestCase):
     def test(self):
         assert CodenameKey.is_standard_params()
         d = DmkFile(refs_file)
-        print("References salt", tuple(d.salt))
+        # print("References salt", tuple(d.salt))
         for name, data in ref_content:
             self.assertEqual(d.get_bytes(name), data)
 

diff --git a/tests/test_shred.py b/tests/test_shred.py
diff --git a/tests/test_storage_file.py b/tests/test_storage_file.py
diff --git a/tests/test_thefile.py b/tests/test_thefile.py