From 2c0c9e24f2201f2684debfcaf6ef387d3b0de599 Mon Sep 17 00:00:00 2001 From: Nick Telfer Date: Wed, 19 Sep 2018 13:07:37 -0600 Subject: [PATCH] changed package name to more closely match naming everywhere else --- .gitignore | 1 + docs/lib/didering.md | 8 ++++---- docs/lib/didering.rst | 8 ++++---- docs/lib/generating.md | 8 ++++---- docs/lib/generating.rst | 8 ++++---- docs/lib/getting_started.md | 2 +- docs/lib/getting_started.rst | 2 +- docs/lib/history_eventing.md | 6 +++--- docs/lib/history_eventing.rst | 6 +++--- docs/lib/historying.md | 16 ++++++++-------- docs/lib/historying.rst | 16 ++++++++-------- docs/lib/otping.md | 16 ++++++++-------- docs/lib/otping.rst | 16 ++++++++-------- docs/models/consensing.md | 2 +- docs/models/consensing.rst | 2 +- setup.py | 17 ++++++++--------- src/{pydidery => diderypy}/__init__.py | 0 src/{pydidery => diderypy}/app.py | 0 src/{pydidery => diderypy}/cli.py | 10 +++++----- src/{pydidery => diderypy}/core/__init__.py | 2 +- src/{pydidery => diderypy}/core/behaving.py | 0 src/{pydidery => diderypy}/diderying.py | 0 src/{pydidery => diderypy}/flo/main.flo | 0 src/{pydidery => diderypy}/help/__init__.py | 0 src/{pydidery => diderypy}/help/consensing.py | 0 src/{pydidery => diderypy}/help/helping.py | 0 src/{pydidery => diderypy}/help/signing.py | 0 src/{pydidery => diderypy}/lib/__init__.py | 0 src/{pydidery => diderypy}/lib/didering.py | 0 src/{pydidery => diderypy}/lib/generating.py | 2 +- .../lib/history_eventing.py | 0 src/{pydidery => diderypy}/lib/historying.py | 0 src/{pydidery => diderypy}/lib/otping.py | 0 src/{pydidery => diderypy}/models/__init__.py | 0 src/{pydidery => diderypy}/models/consensing.py | 0 src/{pydidery => diderypy}/models/responding.py | 0 tests/cli/test_cli.py | 4 ++-- tests/data/history_data_builder.py | 2 +- tests/help/consensing/test_CompositeConsense.py | 2 +- tests/help/consensing/test_Consense.py | 2 +- tests/lib/test_didering.py | 2 +- tests/lib/test_generating.py | 6 +++--- tests/lib/test_history_eventing.py | 6 +++--- tests/lib/test_historying.py | 6 +++--- tests/lib/test_otping.py | 4 ++-- tests/models/test_consensing_models.py | 10 +++++----- tests/models/test_responding.py | 6 +++--- 47 files changed, 99 insertions(+), 99 deletions(-) rename src/{pydidery => diderypy}/__init__.py (100%) rename src/{pydidery => diderypy}/app.py (100%) rename src/{pydidery => diderypy}/cli.py (97%) rename src/{pydidery => diderypy}/core/__init__.py (62%) rename src/{pydidery => diderypy}/core/behaving.py (100%) rename src/{pydidery => diderypy}/diderying.py (100%) rename src/{pydidery => diderypy}/flo/main.flo (100%) rename src/{pydidery => diderypy}/help/__init__.py (100%) rename src/{pydidery => diderypy}/help/consensing.py (100%) rename src/{pydidery => diderypy}/help/helping.py (100%) rename src/{pydidery => diderypy}/help/signing.py (100%) rename src/{pydidery => diderypy}/lib/__init__.py (100%) rename src/{pydidery => diderypy}/lib/didering.py (100%) rename src/{pydidery => diderypy}/lib/generating.py (98%) rename src/{pydidery => diderypy}/lib/history_eventing.py (100%) rename src/{pydidery => diderypy}/lib/historying.py (100%) rename src/{pydidery => diderypy}/lib/otping.py (100%) rename src/{pydidery => diderypy}/models/__init__.py (100%) rename src/{pydidery => diderypy}/models/consensing.py (100%) rename src/{pydidery => diderypy}/models/responding.py (100%) diff --git a/.gitignore b/.gitignore index a7ed5c2..ad64c71 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ wheels/ *.egg-info/ .installed.cfg *.egg +*.lock MANIFEST # PyInstaller diff --git a/docs/lib/didering.md b/docs/lib/didering.md index 3b58bba..b0bd423 100644 --- a/docs/lib/didering.md +++ b/docs/lib/didering.md @@ -12,7 +12,7 @@ didGen accepts an EdDSA (Ed25519) key in the form of a byte string and returns a #### Example ```python -import pydidery.lib.didering as did +import diderypy.lib.didering as did vk = b'\xfdv\xae\xeb\xe7\x08Q\xaf\xedY\xcf\x8b"\xfc\xa6\xeb\x1c@\x89}\xdb\xed\x16\xa5\xb6\x88\x18\xc8\x1a%O\x83' @@ -43,7 +43,7 @@ didGen accepts a url-file safe base64 key in the form of a string and returns a #### Example ```python -import pydidery.lib.didering as did +import diderypy.lib.didering as did vk = "nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -73,7 +73,7 @@ extractDidParts parses and returns a tuple containing the prefix method and key #### Example ```python -import pydidery.lib.didering as did +import diderypy.lib.didering as did did1 = "did:dad:nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -103,7 +103,7 @@ validateDid accepts a [W3C DID](https://w3c-ccg.github.io/did-spec/) string and #### Example ```python -import pydidery.lib.didering as did +import diderypy.lib.didering as did did1 = "did:dad:nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" diff --git a/docs/lib/didering.rst b/docs/lib/didering.rst index fd8197e..83f2305 100644 --- a/docs/lib/didering.rst +++ b/docs/lib/didering.rst @@ -24,7 +24,7 @@ Example .. code:: python - import pydidery.lib.didering as did + import diderypy.lib.didering as did vk = b'\xfdv\xae\xeb\xe7\x08Q\xaf\xedY\xcf\x8b"\xfc\xa6\xeb\x1c@\x89}\xdb\xed\x16\xa5\xb6\x88\x18\xc8\x1a%O\x83' @@ -65,7 +65,7 @@ Example .. code:: python - import pydidery.lib.didering as did + import diderypy.lib.didering as did vk = "nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -107,7 +107,7 @@ Example .. code:: python - import pydidery.lib.didering as did + import diderypy.lib.didering as did did1 = "did:dad:nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -151,7 +151,7 @@ Example .. code:: python - import pydidery.lib.didering as did + import diderypy.lib.didering as did did1 = "did:dad:nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" diff --git a/docs/lib/generating.md b/docs/lib/generating.md index f7b39b8..49e7a86 100644 --- a/docs/lib/generating.md +++ b/docs/lib/generating.md @@ -12,7 +12,7 @@ keyToKey64u allows you to convert a key from a byte string to a base64 url-file #### Example ```python -import pydidery.lib.generating as gen +import diderypy.lib.generating as gen vk = b'\xfdv\xae\xeb\xe7\x08Q\xaf\xedY\xcf\x8b"\xfc\xa6\xeb\x1c@\x89}\xdb\xed\x16\xa5\xb6\x88\x18\xc8\x1a%O\x83' @@ -37,7 +37,7 @@ key64uToKey allows you to convert a base64 url-file safe key string to a byte st #### Example ```python -import pydidery.lib.generating as gen +import diderypy.lib.generating as gen key64u = "nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -63,7 +63,7 @@ keyGen generates a url-file safe base64 public private key pair. If a seed is no #### Example ```python import libnacl -import pydidery.lib.generating as gen +import diderypy.lib.generating as gen seed = libnacl.randombytes(libnacl.crypto_sign_SEEDBYTES) @@ -107,7 +107,7 @@ historyGen generates a new key history dictionary and returns the history along #### Example ```python import libnacl -import pydidery.lib.generating as gen +import diderypy.lib.generating as gen seed = libnacl.randombytes(libnacl.crypto_sign_SEEDBYTES) diff --git a/docs/lib/generating.rst b/docs/lib/generating.rst index 1969af9..fb2120b 100644 --- a/docs/lib/generating.rst +++ b/docs/lib/generating.rst @@ -20,7 +20,7 @@ Example .. code:: python - import pydidery.lib.generating as gen + import diderypy.lib.generating as gen vk = b'\xfdv\xae\xeb\xe7\x08Q\xaf\xedY\xcf\x8b"\xfc\xa6\xeb\x1c@\x89}\xdb\xed\x16\xa5\xb6\x88\x18\xc8\x1a%O\x83' @@ -52,7 +52,7 @@ Example .. code:: python - import pydidery.lib.generating as gen + import diderypy.lib.generating as gen key64u = "nxESHveBmK9RsEkgaZi-cNPvW0zO-ujOWEW7oKb7EYI=" @@ -87,7 +87,7 @@ Example .. code:: python import libnacl - import pydidery.lib.generating as gen + import diderypy.lib.generating as gen seed = libnacl.randombytes(libnacl.crypto_sign_SEEDBYTES) @@ -138,7 +138,7 @@ Example .. code:: python import libnacl - import pydidery.lib.generating as gen + import diderypy.lib.generating as gen seed = libnacl.randombytes(libnacl.crypto_sign_SEEDBYTES) diff --git a/docs/lib/getting_started.md b/docs/lib/getting_started.md index 6e8ba2b..5a2cc4a 100644 --- a/docs/lib/getting_started.md +++ b/docs/lib/getting_started.md @@ -9,7 +9,7 @@ $ pip install -e didery.py/ ## Importing ```python -import pydidery.lib as lib +import diderypy.lib as lib vk, sk, = lib.generating.keyGen() diff --git a/docs/lib/getting_started.rst b/docs/lib/getting_started.rst index 42ecaad..0f5bc06 100644 --- a/docs/lib/getting_started.rst +++ b/docs/lib/getting_started.rst @@ -20,7 +20,7 @@ Importing .. code:: python - import pydidery.lib as lib + import diderypy.lib as lib vk, sk, = lib.generating.keyGen() diff --git a/docs/lib/history_eventing.md b/docs/lib/history_eventing.md index 8361099..985ddd2 100644 --- a/docs/lib/history_eventing.md +++ b/docs/lib/history_eventing.md @@ -12,9 +12,9 @@ getHistoryEvents accepts a W3C decentralized identifier([DID](https://w3c-ccg.gi #### Example ```python -import pydidery.lib.history_eventing as events -import pydidery.lib.historying as hist -import pydidery.lib.generating as gen +import diderypy.lib.history_eventing as events +import diderypy.lib.historying as hist +import diderypy.lib.generating as gen # rotation history must already exist before sending the put request history, vk, sk, pvk, psk = gen.historyGen() diff --git a/docs/lib/history_eventing.rst b/docs/lib/history_eventing.rst index 2c477e6..d83b5ab 100644 --- a/docs/lib/history_eventing.rst +++ b/docs/lib/history_eventing.rst @@ -34,9 +34,9 @@ Example .. code:: python - import pydidery.lib.history_eventing as events - import pydidery.lib.historying as hist - import pydidery.lib.generating as gen + import diderypy.lib.history_eventing as events + import diderypy.lib.historying as hist + import diderypy.lib.generating as gen # rotation history must already exist before sending the put request history, vk, sk, pvk, psk = gen.historyGen() diff --git a/docs/lib/historying.md b/docs/lib/historying.md index cd4dfe3..b083d14 100644 --- a/docs/lib/historying.md +++ b/docs/lib/historying.md @@ -12,8 +12,8 @@ postHistory accepts a didery rotation history, a signing/private key, and a list #### Example ```python -import pydidery.lib.historying as hist -import pydidery.lib.generating as gen +import diderypy.lib.historying as hist +import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() @@ -75,8 +75,8 @@ putHistory sends a rotation event to the didery servers where they verify and st #### Example ```python -import pydidery.lib.historying as hist -import pydidery.lib.generating as gen +import diderypy.lib.historying as hist +import diderypy.lib.generating as gen # rotation history must already exist before sending the put request history, vk, sk, pvk, psk = gen.historyGen() @@ -154,8 +154,8 @@ getHistory accepts a W3C decentralized identifier([DID](https://w3c-ccg.github.i #### Example ```python -import pydidery.lib.historying as hist -import pydidery.lib.generating as gen +import diderypy.lib.historying as hist +import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() @@ -206,8 +206,8 @@ For GDPR compliance a delete method is provided. For security reasons the data #### Example ```python -import pydidery.lib.historying as hist -import pydidery.lib.generating as gen +import diderypy.lib.historying as hist +import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() diff --git a/docs/lib/historying.rst b/docs/lib/historying.rst index 944ef49..ffcf1c9 100644 --- a/docs/lib/historying.rst +++ b/docs/lib/historying.rst @@ -23,8 +23,8 @@ Example .. code:: python - import pydidery.lib.historying as hist - import pydidery.lib.generating as gen + import diderypy.lib.historying as hist + import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() @@ -97,8 +97,8 @@ Example .. code:: python - import pydidery.lib.historying as hist - import pydidery.lib.generating as gen + import diderypy.lib.historying as hist + import diderypy.lib.generating as gen # rotation history must already exist before sending the put request history, vk, sk, pvk, psk = gen.historyGen() @@ -190,8 +190,8 @@ Example .. code:: python - import pydidery.lib.historying as hist - import pydidery.lib.generating as gen + import diderypy.lib.historying as hist + import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() @@ -251,8 +251,8 @@ Example .. code:: python - import pydidery.lib.historying as hist - import pydidery.lib.generating as gen + import diderypy.lib.historying as hist + import diderypy.lib.generating as gen # generate the rotation history history, vk, sk, pvk, psk = gen.historyGen() diff --git a/docs/lib/otping.md b/docs/lib/otping.md index fe73b9b..02992a0 100644 --- a/docs/lib/otping.md +++ b/docs/lib/otping.md @@ -12,8 +12,8 @@ postOtpBlob accepts otp blob dict, a signing/private key, and a list of urls and #### Example ```python -import pydidery.lib.otping as otp -import pydidery.lib.generating as gen +import diderypy.lib.otping as otp +import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() @@ -71,8 +71,8 @@ putOtpBlob sends an updated otp encrypted blob to the didery servers. putOtpBlob #### Example ```python -import pydidery.lib.otping as otp -import pydidery.lib.generating as gen +import diderypy.lib.otping as otp +import diderypy.lib.generating as gen # make sure there is already data on the server for our did vk, sk, did = gen.keyGen() @@ -136,8 +136,8 @@ getOtpBlob accepts a W3C decentralized identifier([DID](https://w3c-ccg.github.i #### Example ```python -import pydidery.lib.otping as otp -import pydidery.lib.generating as gen +import diderypy.lib.otping as otp +import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() @@ -187,8 +187,8 @@ For GDPR compliance a delete method is provided. For security reasons the data #### Example ```python -import pydidery.lib.otping as otp -import pydidery.lib.generating as gen +import diderypy.lib.otping as otp +import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() diff --git a/docs/lib/otping.rst b/docs/lib/otping.rst index bd355ab..5cd0809 100644 --- a/docs/lib/otping.rst +++ b/docs/lib/otping.rst @@ -26,8 +26,8 @@ Example .. code:: python - import pydidery.lib.otping as otp - import pydidery.lib.generating as gen + import diderypy.lib.otping as otp + import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() @@ -95,8 +95,8 @@ Example .. code:: python - import pydidery.lib.otping as otp - import pydidery.lib.generating as gen + import diderypy.lib.otping as otp + import diderypy.lib.generating as gen # make sure there is already data on the server for our did vk, sk, did = gen.keyGen() @@ -174,8 +174,8 @@ Example .. code:: python - import pydidery.lib.otping as otp - import pydidery.lib.generating as gen + import diderypy.lib.otping as otp + import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() @@ -236,8 +236,8 @@ Example .. code:: python - import pydidery.lib.otping as otp - import pydidery.lib.generating as gen + import diderypy.lib.otping as otp + import diderypy.lib.generating as gen # generate a did for the data vk, sk, did = gen.keyGen() diff --git a/docs/models/consensing.md b/docs/models/consensing.md index dee70c4..2519815 100644 --- a/docs/models/consensing.md +++ b/docs/models/consensing.md @@ -22,7 +22,7 @@ The ConsensusResult object has a few static attributes to identify the result of #### Example Usage ```python -from pydidery.models.consensing import ConsensusResult +from diderypy.models.consensing import ConsensusResult # setup the result object result = ConsensusResult("http://localhost:8080", ConsensusResult.VALID) diff --git a/docs/models/consensing.rst b/docs/models/consensing.rst index 2b45598..d805560 100644 --- a/docs/models/consensing.rst +++ b/docs/models/consensing.rst @@ -35,7 +35,7 @@ Example Usage .. code:: python - from pydidery.models.consensing import ConsensusResult + from diderypy.models.consensing import ConsensusResult # setup the result object result = ConsensusResult("http://localhost:8080", ConsensusResult.VALID) diff --git a/setup.py b/setup.py index f571947..cea2760 100644 --- a/setup.py +++ b/setup.py @@ -91,14 +91,14 @@ def _unavailable(self, e): setup( - name='py-didery', - version='0.0.1', + name='diderypy', + version='0.0.2', license='Apache2', - description='didery communication library', - long_description="Python library and cli for communicating with didery servers.", + description='SDK for working with Didery servers', + long_description="Python library and cli for communicating with distributed didery servers.", author='Nicholas Telfer', author_email='nick.telfer@consensys.net', - url='https://github.com/reputage/py-didery', + url='https://github.com/reputage/didery.py', packages=find_packages('src'), package_dir={'': 'src'}, py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')], @@ -106,12 +106,11 @@ def _unavailable(self, e): zip_safe=False, classifiers=[ # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers - 'Development Status :: 5 - Production/Stable', + 'Development Status :: 3 - Alpha', 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache2 License', + 'License :: OSI Approved :: Apache Software License', 'Operating System :: Unix', 'Operating System :: POSIX', - 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: Implementation :: CPython', @@ -134,7 +133,7 @@ def _unavailable(self, e): ] if Cython else [], entry_points={ 'console_scripts': [ - 'didery=pydidery.cli:main', + 'didery=diderypy.cli:main', ] }, cmdclass={'build_ext': optional_build_ext}, diff --git a/src/pydidery/__init__.py b/src/diderypy/__init__.py similarity index 100% rename from src/pydidery/__init__.py rename to src/diderypy/__init__.py diff --git a/src/pydidery/app.py b/src/diderypy/app.py similarity index 100% rename from src/pydidery/app.py rename to src/diderypy/app.py diff --git a/src/pydidery/cli.py b/src/diderypy/cli.py similarity index 97% rename from src/pydidery/cli.py rename to src/diderypy/cli.py index 9a04eb7..c097447 100644 --- a/src/pydidery/cli.py +++ b/src/diderypy/cli.py @@ -20,9 +20,9 @@ from ioflo.aid import odict -from pydidery.help import helping as h -from pydidery.diderying import ValidationError -from pydidery.lib import generating as gen +from diderypy.help import helping as h +from diderypy.diderying import ValidationError +from diderypy.lib import generating as gen try: import simplejson as json @@ -217,7 +217,7 @@ def main(incept, upload, rotate, update, retrieve, download, delete, remove, eve ) ) ) - floScriptpath = os.path.join(projectDirpath, "pydidery/flo/main.flo") + floScriptpath = os.path.join(projectDirpath, "diderypy/flo/main.flo") """ Main entry point for ioserve CLI""" ioflo.app.run.run( name="didery.py", @@ -225,7 +225,7 @@ def main(incept, upload, rotate, update, retrieve, download, delete, remove, eve real=True, retro=True, filepath=floScriptpath, - behaviors=['pydidery.core'], + behaviors=['diderypy.core'], mode='', username='', password='', diff --git a/src/pydidery/core/__init__.py b/src/diderypy/core/__init__.py similarity index 62% rename from src/pydidery/core/__init__.py rename to src/diderypy/core/__init__.py index 23be038..1f36fe0 100644 --- a/src/pydidery/core/__init__.py +++ b/src/diderypy/core/__init__.py @@ -9,4 +9,4 @@ _modules = ['behaving', ] for m in _modules: - importlib.import_module(".{0}".format(m), package='pydidery.core') + importlib.import_module(".{0}".format(m), package='diderypy.core') diff --git a/src/pydidery/core/behaving.py b/src/diderypy/core/behaving.py similarity index 100% rename from src/pydidery/core/behaving.py rename to src/diderypy/core/behaving.py diff --git a/src/pydidery/diderying.py b/src/diderypy/diderying.py similarity index 100% rename from src/pydidery/diderying.py rename to src/diderypy/diderying.py diff --git a/src/pydidery/flo/main.flo b/src/diderypy/flo/main.flo similarity index 100% rename from src/pydidery/flo/main.flo rename to src/diderypy/flo/main.flo diff --git a/src/pydidery/help/__init__.py b/src/diderypy/help/__init__.py similarity index 100% rename from src/pydidery/help/__init__.py rename to src/diderypy/help/__init__.py diff --git a/src/pydidery/help/consensing.py b/src/diderypy/help/consensing.py similarity index 100% rename from src/pydidery/help/consensing.py rename to src/diderypy/help/consensing.py diff --git a/src/pydidery/help/helping.py b/src/diderypy/help/helping.py similarity index 100% rename from src/pydidery/help/helping.py rename to src/diderypy/help/helping.py diff --git a/src/pydidery/help/signing.py b/src/diderypy/help/signing.py similarity index 100% rename from src/pydidery/help/signing.py rename to src/diderypy/help/signing.py diff --git a/src/pydidery/lib/__init__.py b/src/diderypy/lib/__init__.py similarity index 100% rename from src/pydidery/lib/__init__.py rename to src/diderypy/lib/__init__.py diff --git a/src/pydidery/lib/didering.py b/src/diderypy/lib/didering.py similarity index 100% rename from src/pydidery/lib/didering.py rename to src/diderypy/lib/didering.py diff --git a/src/pydidery/lib/generating.py b/src/diderypy/lib/generating.py similarity index 98% rename from src/pydidery/lib/generating.py rename to src/diderypy/lib/generating.py index b8a90f8..e5b7879 100644 --- a/src/pydidery/lib/generating.py +++ b/src/diderypy/lib/generating.py @@ -1,7 +1,7 @@ import base64 import libnacl -import pydidery.lib.didering as didering +import diderypy.lib.didering as didering """ This module provides various key generation and manipulation functions for use with the didery server. diff --git a/src/pydidery/lib/history_eventing.py b/src/diderypy/lib/history_eventing.py similarity index 100% rename from src/pydidery/lib/history_eventing.py rename to src/diderypy/lib/history_eventing.py diff --git a/src/pydidery/lib/historying.py b/src/diderypy/lib/historying.py similarity index 100% rename from src/pydidery/lib/historying.py rename to src/diderypy/lib/historying.py diff --git a/src/pydidery/lib/otping.py b/src/diderypy/lib/otping.py similarity index 100% rename from src/pydidery/lib/otping.py rename to src/diderypy/lib/otping.py diff --git a/src/pydidery/models/__init__.py b/src/diderypy/models/__init__.py similarity index 100% rename from src/pydidery/models/__init__.py rename to src/diderypy/models/__init__.py diff --git a/src/pydidery/models/consensing.py b/src/diderypy/models/consensing.py similarity index 100% rename from src/pydidery/models/consensing.py rename to src/diderypy/models/consensing.py diff --git a/src/pydidery/models/responding.py b/src/diderypy/models/responding.py similarity index 100% rename from src/pydidery/models/responding.py rename to src/diderypy/models/responding.py diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py index 670a76c..a413de1 100644 --- a/tests/cli/test_cli.py +++ b/tests/cli/test_cli.py @@ -5,8 +5,8 @@ import json from click.testing import CliRunner -from pydidery.cli import main -from pydidery.lib import generating as gen +from diderypy.cli import main +from diderypy.lib import generating as gen def parsOutput(data): diff --git a/tests/data/history_data_builder.py b/tests/data/history_data_builder.py index b65b60c..7a89a3e 100644 --- a/tests/data/history_data_builder.py +++ b/tests/data/history_data_builder.py @@ -1,5 +1,5 @@ from .builder import SignableDataBuilder -from pydidery.models.responding import DideryResponse, HistoryData +from diderypy.models.responding import DideryResponse, HistoryData class BasicHistoryBuilder(SignableDataBuilder): diff --git a/tests/help/consensing/test_CompositeConsense.py b/tests/help/consensing/test_CompositeConsense.py index b7897a6..3a0e47c 100644 --- a/tests/help/consensing/test_CompositeConsense.py +++ b/tests/help/consensing/test_CompositeConsense.py @@ -1,7 +1,7 @@ from hashlib import sha256 from collections import OrderedDict as ODict -from pydidery.help import consensing +from diderypy.help import consensing from tests.data import history_data_builder as builder diff --git a/tests/help/consensing/test_Consense.py b/tests/help/consensing/test_Consense.py index f53012b..687c822 100644 --- a/tests/help/consensing/test_Consense.py +++ b/tests/help/consensing/test_Consense.py @@ -1,4 +1,4 @@ -from pydidery.help import consensing +from diderypy.help import consensing from tests.data import history_data_builder as builder diff --git a/tests/lib/test_didering.py b/tests/lib/test_didering.py index 9bdb5f7..cea6e46 100644 --- a/tests/lib/test_didering.py +++ b/tests/lib/test_didering.py @@ -1,6 +1,6 @@ import pytest -from pydidery.lib import didering +from diderypy.lib import didering def testDidGenWithNone(): diff --git a/tests/lib/test_generating.py b/tests/lib/test_generating.py index a2bb418..3dbcd5e 100644 --- a/tests/lib/test_generating.py +++ b/tests/lib/test_generating.py @@ -1,8 +1,8 @@ import libnacl -from pydidery.lib import generating as gen -from pydidery.lib import didering -from pydidery.help import signing as sign +from diderypy.lib import generating as gen +from diderypy.lib import didering +from diderypy.help import signing as sign def testDidGen(): diff --git a/tests/lib/test_history_eventing.py b/tests/lib/test_history_eventing.py index 63f147f..36eed04 100644 --- a/tests/lib/test_history_eventing.py +++ b/tests/lib/test_history_eventing.py @@ -1,8 +1,8 @@ import pytest -from pydidery.lib import history_eventing as event -from pydidery.lib import generating as gen -from pydidery.lib import historying as hist +from diderypy.lib import history_eventing as event +from diderypy.lib import generating as gen +from diderypy.lib import historying as hist history, vk1, sk1, vk2, sk2 = gen.historyGen() diff --git a/tests/lib/test_historying.py b/tests/lib/test_historying.py index c154abf..4724e25 100644 --- a/tests/lib/test_historying.py +++ b/tests/lib/test_historying.py @@ -9,9 +9,9 @@ # import didery.routing -from pydidery.help import helping as h -from pydidery.lib import generating as gen -from pydidery.lib import historying as hist +from diderypy.help import helping as h +from diderypy.lib import generating as gen +from diderypy.lib import historying as hist history, vk1, sk1, vk2, sk2 = gen.historyGen() vk3, sk3, did3 = gen.keyGen() diff --git a/tests/lib/test_otping.py b/tests/lib/test_otping.py index 9edf0ad..1a15053 100644 --- a/tests/lib/test_otping.py +++ b/tests/lib/test_otping.py @@ -9,8 +9,8 @@ # import didery.routing -from pydidery.lib import generating as gen -from pydidery.lib import otping as otp +from diderypy.lib import generating as gen +from diderypy.lib import otping as otp vk, sk, did = gen.keyGen() otpData = { diff --git a/tests/models/test_consensing_models.py b/tests/models/test_consensing_models.py index c3a806a..26a0434 100644 --- a/tests/models/test_consensing_models.py +++ b/tests/models/test_consensing_models.py @@ -3,11 +3,11 @@ except ImportError: import json -from pydidery.help import consensing -from pydidery.help import signing -from pydidery.lib import generating as gen -from pydidery.models import responding as resp -from pydidery.models import consensing as consenseModel +from diderypy.help import consensing +from diderypy.help import signing +from diderypy.lib import generating as gen +from diderypy.models import responding as resp +from diderypy.models import consensing as consenseModel HISTORY = 0 diff --git a/tests/models/test_responding.py b/tests/models/test_responding.py index ad9598c..f01428c 100644 --- a/tests/models/test_responding.py +++ b/tests/models/test_responding.py @@ -3,9 +3,9 @@ except ImportError: import json -from pydidery.help import signing -from pydidery.lib import generating as gen -from pydidery.models import responding as resp +from diderypy.help import signing +from diderypy.lib import generating as gen +from diderypy.models import responding as resp HISTORY = 0