Merge pull request #817 from KPrasch/master

[Release] Bump version: 0.1.0-alpha.14 → 0.1.0-alpha.17

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0-alpha.14
+current_version = 0.1.0-alpha.17
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<stage>[^.]*)\.(?P<devnum>\d+))?

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
 

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"]

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

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

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.17'
 
 
 # -- General configuration ---------------------------------------------------

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.17"
 
 __author__ = "NuCypher"
 

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",