diff --git a/Pipfile b/Pipfile index cb16c06..fc7b7bf 100644 --- a/Pipfile +++ b/Pipfile @@ -20,7 +20,7 @@ psycopg2 = ">=2.6.1" requests = ">=2.7.0" six = ">=1.9.0" notebook = {extras = ["test"],version = ">=4.0"} -hybrid-content-manager = {editable = true,extras = ["test"],path = "."} +hybridcontents = {editable = true,extras = ["test"],path = "."} [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index 43cfe6d..e2b3f60 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "77a842073e32867820adc0a3322dad0340996151134000d00a2e2f9deb14d9e9" + "sha256": "aa05434c044c02fec086fbb04338987d6961177024d6bdddf8f5fefc4a2eac06" }, "pipfile-spec": 6, "requires": { @@ -21,7 +21,7 @@ "sha256:5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0", "sha256:8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" ], - "markers": "platform_system == 'Darwin'", + "markers": "sys_platform == 'darwin'", "version": "==0.1.0" }, "attrs": { @@ -138,7 +138,7 @@ ], "version": "==2.2.5" }, - "hybrid-content-manager": { + "hybridcontents": { "editable": true, "extras": [ "test" @@ -251,10 +251,10 @@ }, "mccabe": { "hashes": [ - "sha256:5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16", - "sha256:bd6c080fb372aebcb0ce19e35ddac744f2abf5a7befa207db2d1097d48efe63a" + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" ], - "version": "==0.3.1" + "version": "==0.6.1" }, "mistune": { "hashes": [ @@ -300,11 +300,11 @@ }, "nose": { "hashes": [ - "sha256:76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03", - "sha256:78b03116badd0dbb2ed4dedc96a4a3d42138b94bb89fc2eb99f7f3bdfd199f56", - "sha256:cc8aebdec5a5fb989912f157f77b3c21a5e2f2da623af90a7b476b106a834abf" + "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", + "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", + "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" ], - "version": "==1.3.4" + "version": "==1.3.7" }, "nose-exclude": { "hashes": [ @@ -312,12 +312,6 @@ ], "version": "==0.5.0" }, - "nose-ignore-docstring": { - "hashes": [ - "sha256:f58aea0e3ff5e749c3b0e09810d31b47c6d3eea81de23cdecb46de53bcd43a77" - ], - "version": "==0.2" - }, "nose-warnings-filters": { "hashes": [ "sha256:09ad91b734b4069c0ad2dd4a78abb5f02d7150847f954a013d49647fad77ae4e", @@ -358,17 +352,17 @@ }, "pbr": { "hashes": [ - "sha256:2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8", - "sha256:b32c8ccaac7b1a20c0ce00ce317642e6cf231cf038f9875e0280e28af5bf7ac9" + "sha256:139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b", + "sha256:61aa52a0f18b71c5cc58232d2cf8f8d09cd67fcad60b742a60124cb8d6951488" ], - "version": "==5.4.3" + "version": "==5.4.4" }, "pep8": { "hashes": [ - "sha256:4aa129df8d9007b192bf82013f415533994652d7caa930d002687eb42a6c2a41", - "sha256:b8b7e35630b5539e26a197dfc6005be9e1e9a135496b377723a8ebc01b9bcbff" + "sha256:b22cfae5db09833bb9bd7c8463b53e1a9c9b39f12e304a8d0bba729c501827ee", + "sha256:fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374" ], - "version": "==1.6.2" + "version": "==1.7.1" }, "pexpect": { "hashes": [ @@ -387,10 +381,10 @@ }, "pluggy": { "hashes": [ - "sha256:0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", - "sha256:fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" + "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", + "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], - "version": "==0.13.0" + "version": "==0.13.1" }, "prometheus-client": { "hashes": [ @@ -442,17 +436,17 @@ }, "pyflakes": { "hashes": [ - "sha256:02691c23ce699f252874b7c27f14cf26e3d4e82b58e5d584f000b7ab5be36a5f", - "sha256:05df584a29eeea9a2a2110dd362e53d04e0c4bb1754b4d71234f651917f3c2f0" + "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", + "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2" ], - "version": "==0.9.2" + "version": "==2.1.1" }, "pygments": { "hashes": [ - "sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", - "sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297" + "sha256:83ec6c6133ca6b529b7ff5aa826328fd14b5bb02a58c37f4f06384e96a0f94ab", + "sha256:b7949de3d396836085fea596998b135a22610bbcc4f2abfe9e448e44cbc58388" ], - "version": "==2.4.2" + "version": "==2.5.1" }, "pyparsing": { "hashes": [ @@ -463,16 +457,16 @@ }, "pyrsistent": { "hashes": [ - "sha256:eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778" + "sha256:f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b" ], - "version": "==0.15.5" + "version": "==0.15.6" }, "pytest": { "hashes": [ - "sha256:1897d74f60a5d8be02e06d708b41bf2445da2ee777066bd68edf14474fc201eb", - "sha256:f6a567e20c04259d41adce9a360bd8991e6aa29dd9695c5e6bd25a9779272673" + "sha256:63344a2e3bce2e4d522fd62b4fdebb647c019f1f9e4ca075debbd13219db4418", + "sha256:f67403f33b2b1d25a6756184077394167fe5e2f9d8bdaab30707d19ccec35427" ], - "version": "==5.3.0" + "version": "==5.3.1" }, "pytest-cov": { "hashes": [ @@ -607,10 +601,10 @@ }, "virtualenv": { "hashes": [ - "sha256:11cb4608930d5fd3afb545ecf8db83fa50e1f96fc4fca80c94b07d2c83146589", - "sha256:d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136" + "sha256:116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0", + "sha256:b57776b44f91511866594e477dd10e76a6eb44439cdd7f06dcd30ba4c5bd854f" ], - "version": "==16.7.7" + "version": "==16.7.8" }, "wcwidth": { "hashes": [ @@ -658,10 +652,10 @@ }, "mccabe": { "hashes": [ - "sha256:5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16", - "sha256:bd6c080fb372aebcb0ce19e35ddac744f2abf5a7befa207db2d1097d48efe63a" + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" ], - "version": "==0.3.1" + "version": "==0.6.1" }, "mock": { "hashes": [ @@ -679,16 +673,17 @@ }, "nose": { "hashes": [ - "sha256:76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03", - "sha256:78b03116badd0dbb2ed4dedc96a4a3d42138b94bb89fc2eb99f7f3bdfd199f56", - "sha256:cc8aebdec5a5fb989912f157f77b3c21a5e2f2da623af90a7b476b106a834abf" + "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", + "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", + "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" ], - "version": "==1.3.4" + "version": "==1.3.7" }, "nose-ignore-docstring": { "hashes": [ "sha256:f58aea0e3ff5e749c3b0e09810d31b47c6d3eea81de23cdecb46de53bcd43a77" ], + "index": "pypi", "version": "==0.2" }, "packaging": { @@ -700,24 +695,24 @@ }, "pbr": { "hashes": [ - "sha256:2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8", - "sha256:b32c8ccaac7b1a20c0ce00ce317642e6cf231cf038f9875e0280e28af5bf7ac9" + "sha256:139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b", + "sha256:61aa52a0f18b71c5cc58232d2cf8f8d09cd67fcad60b742a60124cb8d6951488" ], - "version": "==5.4.3" + "version": "==5.4.4" }, "pep8": { "hashes": [ - "sha256:4aa129df8d9007b192bf82013f415533994652d7caa930d002687eb42a6c2a41", - "sha256:b8b7e35630b5539e26a197dfc6005be9e1e9a135496b377723a8ebc01b9bcbff" + "sha256:b22cfae5db09833bb9bd7c8463b53e1a9c9b39f12e304a8d0bba729c501827ee", + "sha256:fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374" ], - "version": "==1.6.2" + "version": "==1.7.1" }, "pluggy": { "hashes": [ - "sha256:0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", - "sha256:fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" + "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", + "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], - "version": "==0.13.0" + "version": "==0.13.1" }, "py": { "hashes": [ @@ -728,10 +723,10 @@ }, "pyflakes": { "hashes": [ - "sha256:02691c23ce699f252874b7c27f14cf26e3d4e82b58e5d584f000b7ab5be36a5f", - "sha256:05df584a29eeea9a2a2110dd362e53d04e0c4bb1754b4d71234f651917f3c2f0" + "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", + "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2" ], - "version": "==0.9.2" + "version": "==2.1.1" }, "pyparsing": { "hashes": [ @@ -771,10 +766,10 @@ }, "virtualenv": { "hashes": [ - "sha256:11cb4608930d5fd3afb545ecf8db83fa50e1f96fc4fca80c94b07d2c83146589", - "sha256:d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136" + "sha256:116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0", + "sha256:b57776b44f91511866594e477dd10e76a6eb44439cdd7f06dcd30ba4c5bd854f" ], - "version": "==16.7.7" + "version": "==16.7.8" }, "zipp": { "hashes": [ diff --git a/hybrid_content_manager/__init__.py b/hybridcontents/__init__.py similarity index 100% rename from hybrid_content_manager/__init__.py rename to hybridcontents/__init__.py diff --git a/hybrid_content_manager/api_utils.py b/hybridcontents/api_utils.py similarity index 100% rename from hybrid_content_manager/api_utils.py rename to hybridcontents/api_utils.py diff --git a/hybrid_content_manager/hybridmanager.py b/hybridcontents/hybridmanager.py similarity index 95% rename from hybrid_content_manager/hybridmanager.py rename to hybridcontents/hybridmanager.py index b1fa7b4..48581fe 100644 --- a/hybrid_content_manager/hybridmanager.py +++ b/hybridcontents/hybridmanager.py @@ -195,18 +195,11 @@ def _validate_path(self, prefix, path): path_is_valid = validator(path) - # Ensure return type is bool - if type(path_is_valid) is not bool: - raise HTTPError( - 400, - "The provided path_validator for the prefix '{prefix}' does not return a boolean" - .format(prefix=prefix, path=path)) - if not path_is_valid: raise HTTPError( - 401, - "The provided path_validator for the prefix '{prefix}' has flagged the path '{path}' as invalid." - .format(prefix=prefix, path=path)) + 405, + "The path '{path}' is not valid for the prefix '{prefix}'". + format(path=path, prefix=prefix)) return path_is_valid diff --git a/hybrid_content_manager/ipycompat.py b/hybridcontents/ipycompat.py similarity index 100% rename from hybrid_content_manager/ipycompat.py rename to hybridcontents/ipycompat.py diff --git a/hybrid_content_manager/tests/__init__.py b/hybridcontents/tests/__init__.py similarity index 100% rename from hybrid_content_manager/tests/__init__.py rename to hybridcontents/tests/__init__.py diff --git a/hybrid_content_manager/tests/test_hybrid_manager.py b/hybridcontents/tests/test_hybrid_manager.py similarity index 98% rename from hybrid_content_manager/tests/test_hybrid_manager.py rename to hybridcontents/tests/test_hybrid_manager.py index e37cd67..daeb25c 100644 --- a/hybrid_content_manager/tests/test_hybrid_manager.py +++ b/hybridcontents/tests/test_hybrid_manager.py @@ -21,7 +21,7 @@ from IPython.utils.tempdir import TemporaryDirectory -from hybrid_content_manager.hybridmanager import HybridContentsManager +from hybridcontents.hybridmanager import HybridContentsManager from .testing_utils import assertRaisesHTTPError @@ -323,13 +323,13 @@ def test_rename_invalid_path(self): old_path = 'Untitled.yaml' new_path = 'A/Untitled.yaml' - with assertRaisesHTTPError(self, 401): + with assertRaisesHTTPError(self, 405): cm.rename(old_path, new_path) def test_save_invalid_path(self): cm = self.contents_manager - with assertRaisesHTTPError(self, 401): + with assertRaisesHTTPError(self, 405): cm.new_untitled(path='A', ext='.yaml') def tearDown(self): diff --git a/hybrid_content_manager/tests/testing_utils.py b/hybridcontents/tests/testing_utils.py similarity index 100% rename from hybrid_content_manager/tests/testing_utils.py rename to hybridcontents/tests/testing_utils.py diff --git a/setup.py b/setup.py index ca92d24..58f15c4 100644 --- a/setup.py +++ b/setup.py @@ -21,13 +21,13 @@ def main(): test_reqs = read_requirements('requirements_test.txt') setup( - name='hybrid-content-manager', + name='hybridcontents', version='0.6', description="Hybrid Content Manager", long_description=long_description, author="viaduct.ai", author_email="engineering@viaduct.ai", - packages=find_packages(include='hybrid_content_manager.*'), + packages=find_packages(include='hybridcontents.*'), license='Apache 2.0', include_package_data=True, zip_safe=True, diff --git a/tox.ini b/tox.ini index 4bc4a93..ce98d72 100644 --- a/tox.ini +++ b/tox.ini @@ -16,4 +16,4 @@ deps = py{27,36,37}-notebook{4,5,6}: .[test] commands = - py{27,36,37}-notebook{4,5,6}: pytest hybrid_content_manager/tests + py{27,36,37}-notebook{4,5,6}: pytest hybridcontents/tests