From cc135b1e1d6a655a4e00fdadb552dd0abc45f8a6 Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 8 Mar 2019 14:24:22 -0800 Subject: [PATCH 1/5] =?UTF-8?q?Bump=20version:=200.1.0-alpha.14=20?= =?UTF-8?q?=E2=86=92=200.1.0-alpha.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/source/conf.py | 2 +- nucypher/__about__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf9c8bd96..cef753b1c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0-alpha.14 +current_version = 0.1.0-alpha.15 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[^.]*)\.(?P\d+))? diff --git a/docs/source/conf.py b/docs/source/conf.py index edd589031..ec1ef65b2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ author = 'NuCypher' # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '0.1.0-alpha.14' +release = '0.1.0-alpha.15' # -- General configuration --------------------------------------------------- diff --git a/nucypher/__about__.py b/nucypher/__about__.py index bf3c70afc..4150b74ef 100644 --- a/nucypher/__about__.py +++ b/nucypher/__about__.py @@ -28,7 +28,7 @@ __url__ = "https://github.com/nucypher/nucypher" __summary__ = 'A proxy re-encryption network to empower privacy in decentralized systems.' -__version__ = "0.1.0-alpha.14" +__version__ = "0.1.0-alpha.15" __author__ = "NuCypher" From bd9aa10edf041004e02af35c655f319af691c2be Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 8 Mar 2019 14:53:25 -0800 Subject: [PATCH 2/5] Use official AGPL trove classifier. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6bfcd86b3..a9b9cbf14 100644 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(name=ABOUT['__title__'], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", - "License :: OSI Approved :: GNU Affero General Public License v3 (AGPLv3)", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python", From 521e3832b99f3d04416dfc67f3e14c1ab4e4b8c2 Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 8 Mar 2019 14:53:51 -0800 Subject: [PATCH 3/5] =?UTF-8?q?Bump=20version:=200.1.0-alpha.15=20?= =?UTF-8?q?=E2=86=92=200.1.0-alpha.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/source/conf.py | 2 +- nucypher/__about__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cef753b1c..440083d70 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0-alpha.15 +current_version = 0.1.0-alpha.16 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[^.]*)\.(?P\d+))? diff --git a/docs/source/conf.py b/docs/source/conf.py index ec1ef65b2..900bc6287 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ author = 'NuCypher' # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '0.1.0-alpha.15' +release = '0.1.0-alpha.16' # -- General configuration --------------------------------------------------- diff --git a/nucypher/__about__.py b/nucypher/__about__.py index 4150b74ef..77370a665 100644 --- a/nucypher/__about__.py +++ b/nucypher/__about__.py @@ -28,7 +28,7 @@ __url__ = "https://github.com/nucypher/nucypher" __summary__ = 'A proxy re-encryption network to empower privacy in decentralized systems.' -__version__ = "0.1.0-alpha.15" +__version__ = "0.1.0-alpha.16" __author__ = "NuCypher" From 4636811e0f437c1a0d3624d43e98a426e0df9bbc Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 8 Mar 2019 15:18:00 -0800 Subject: [PATCH 4/5] Deployment side-effects of recent API updates. --- deploy/ansible/ursulas/run_seednodes.yml | 4 ++-- deploy/docker/Dockerfile | 2 +- deploy/services/firstula_node.j2 | 2 +- deploy/services/ursula_node.j2 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/ansible/ursulas/run_seednodes.yml b/deploy/ansible/ursulas/run_seednodes.yml index 01af303b4..47e0fe172 100644 --- a/deploy/ansible/ursulas/run_seednodes.yml +++ b/deploy/ansible/ursulas/run_seednodes.yml @@ -53,7 +53,7 @@ when: stat_result.stat.exists == False - name: "Configure Ursula" - shell: "/home/ubuntu/venv/bin/nucypher ursula init --federated-only --rest-host {{ inventory_hostname }}" + shell: "/home/ubuntu/venv/bin/nucypher ursula init --federated-only --rest-host {{ inventory_hostname }} --network {{ lookup('env', 'NUCYPHER_NETWORK_NAME') }}" args: chdir: ./code environment: @@ -66,7 +66,7 @@ - name: "Get Ursula Seed Node Config (and more)" slurp: - src: "~/.local/share/nucypher/ursula.config" + src: "~/.local/share/nucypher/Ursula.config" register: ursula_seed_node_config run_once: true diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 208ca314e..cb00cea0f 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -12,6 +12,6 @@ COPY . /code # Run pipenv RUN pip3 install . -RUN ./scripts/install_solc.sh +RUN ./scripts/installation/install_solc.sh CMD ["/bin/bash"] diff --git a/deploy/services/firstula_node.j2 b/deploy/services/firstula_node.j2 index 6ba98ff22..91191300f 100644 --- a/deploy/services/firstula_node.j2 +++ b/deploy/services/firstula_node.j2 @@ -5,7 +5,7 @@ Description="Run 'Lonely Ursula' - The Original Network Node." User=ubuntu Type=simple Environment="NUCYPHER_KEYRING_PASSWORD={{ ursula_password.stdout }}" -ExecStart={{ virtualenv_path }}/bin/nucypher ursula run --debug --lonely --network {{ nucypher_network_domain }} +ExecStart={{ virtualenv_path }}/bin/nucypher --debug ursula run --lonely --network {{ nucypher_network_domain }} [Install] WantedBy=multi-user.target diff --git a/deploy/services/ursula_node.j2 b/deploy/services/ursula_node.j2 index ac02f11b3..2e409bd01 100644 --- a/deploy/services/ursula_node.j2 +++ b/deploy/services/ursula_node.j2 @@ -5,7 +5,7 @@ Description="Run 'Ursula', A NuCypher Staking Node." User=ubuntu Type=simple Environment="NUCYPHER_KEYRING_PASSWORD={{ursula_password.stdout}}" -ExecStart={{ virtualenv_path }}/bin/nucypher ursula run --network {{ nucypher_network_domain }} --debug --federated-only --teacher-uri {{ seed_node_metadata.checksum_public_address }}@https://{{ seed_node_metadata.rest_host }}:{{seed_node_metadata.rest_port}} +ExecStart={{ virtualenv_path }}/bin/nucypher --debug ursula run --network {{ nucypher_network_domain }} --federated-only --teacher-uri {{ seed_node_metadata.checksum_public_address }}@https://{{ seed_node_metadata.rest_host }}:{{seed_node_metadata.rest_port}} [Install] WantedBy=multi-user.target From b1597086a6a9e47a4519d49103b4a0f2bf6e7819 Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 8 Mar 2019 15:18:16 -0800 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=200.1.0-alpha.16=20?= =?UTF-8?q?=E2=86=92=200.1.0-alpha.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/source/conf.py | 2 +- nucypher/__about__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 440083d70..bef0eb78d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0-alpha.16 +current_version = 0.1.0-alpha.17 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[^.]*)\.(?P\d+))? diff --git a/docs/source/conf.py b/docs/source/conf.py index 900bc6287..b79a5eeab 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ author = 'NuCypher' # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '0.1.0-alpha.16' +release = '0.1.0-alpha.17' # -- General configuration --------------------------------------------------- diff --git a/nucypher/__about__.py b/nucypher/__about__.py index 77370a665..7df70e85e 100644 --- a/nucypher/__about__.py +++ b/nucypher/__about__.py @@ -28,7 +28,7 @@ __url__ = "https://github.com/nucypher/nucypher" __summary__ = 'A proxy re-encryption network to empower privacy in decentralized systems.' -__version__ = "0.1.0-alpha.16" +__version__ = "0.1.0-alpha.17" __author__ = "NuCypher"