From 4033e57d817220bab2d5373ceab4c3cea0663aff Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Thu, 8 Aug 2019 19:38:12 -0700 Subject: [PATCH 1/5] add missing requirements.indy.txt to demo docker image Signed-off-by: Andrew Whitehead --- docker/Dockerfile.demo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo index a30f069bce..7bdf80a20d 100644 --- a/docker/Dockerfile.demo +++ b/docker/Dockerfile.demo @@ -3,8 +3,7 @@ FROM bcgovimages/von-image:py36-1.11-0 ENV ENABLE_PTVSD 0 # Add and install Indy Agent code -ADD requirements.txt . -ADD requirements.dev.txt . +ADD requirements*.txt ./ RUN pip3 install --no-cache-dir -r requirements.txt -r requirements.dev.txt From ba03f1272f7685d91bd472d46569b646bcbb81b2 Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Thu, 8 Aug 2019 19:38:45 -0700 Subject: [PATCH 2/5] avoid relative imports in demo runner scripts (fix from @SmithSamuelM) Signed-off-by: Andrew Whitehead --- demo/runners/acme.py | 6 ++++-- demo/runners/alice.py | 6 ++++-- demo/runners/faber.py | 6 ++++-- demo/runners/performance.py | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/demo/runners/acme.py b/demo/runners/acme.py index e1cc79274f..e88e1dd5dc 100644 --- a/demo/runners/acme.py +++ b/demo/runners/acme.py @@ -4,8 +4,10 @@ import os import sys -from .support.agent import DemoAgent, default_genesis_txns -from .support.utils import ( +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) # noqa + +from runners.support.agent import DemoAgent, default_genesis_txns +from runners.support.utils import ( log_json, log_msg, log_status, diff --git a/demo/runners/alice.py b/demo/runners/alice.py index 23507a2d38..18590e8a4d 100644 --- a/demo/runners/alice.py +++ b/demo/runners/alice.py @@ -4,8 +4,10 @@ import os import sys -from .support.agent import DemoAgent, default_genesis_txns -from .support.utils import ( +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) # noqa + +from runners.support.agent import DemoAgent, default_genesis_txns +from runners.support.utils import ( log_json, log_msg, log_status, diff --git a/demo/runners/faber.py b/demo/runners/faber.py index 508d8092bf..9f3fa239ba 100644 --- a/demo/runners/faber.py +++ b/demo/runners/faber.py @@ -5,8 +5,10 @@ import random import sys -from .support.agent import DemoAgent, default_genesis_txns -from .support.utils import ( +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) # noqa + +from runners.support.agent import DemoAgent, default_genesis_txns +from runners.support.utils import ( log_json, log_msg, log_status, diff --git a/demo/runners/performance.py b/demo/runners/performance.py index 76065c67ee..62afc6ff8f 100644 --- a/demo/runners/performance.py +++ b/demo/runners/performance.py @@ -4,8 +4,10 @@ import random import sys -from .support.agent import DemoAgent, default_genesis_txns -from .support.utils import log_timer, progress, require_indy +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) # noqa + +from runners.support.agent import DemoAgent, default_genesis_txns +from runners.support.utils import log_timer, progress, require_indy LOGGER = logging.getLogger(__name__) From 439f55a2428119e96b1256633b93e0f80479840e Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Thu, 8 Aug 2019 19:41:40 -0700 Subject: [PATCH 3/5] add requirements.indy.txt to Dockerfile.run image Signed-off-by: Andrew Whitehead --- docker/Dockerfile.run | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run index 683a84668a..9046d1216d 100644 --- a/docker/Dockerfile.run +++ b/docker/Dockerfile.run @@ -2,9 +2,7 @@ FROM bcgovimages/von-image:py36-1.11-0 ENV ENABLE_PTVSD 0 -ADD requirements.txt . -ADD requirements.dev.txt . - +ADD requirements*.txt ./ RUN pip3 install --no-cache-dir -r requirements.txt -r requirements.dev.txt From 56ff55261cb06a973216462bc1bb91453a68ebbf Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Thu, 8 Aug 2019 20:13:08 -0700 Subject: [PATCH 4/5] add 0.3.0 updates to changelog Signed-off-by: Andrew Whitehead --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d34489c567..da96711e97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +# 0.3.0 + +## August 9, 2019 + +- Ledger and wallet config updates; add support for transaction author agreements [#127](https://github.com/hyperledger/aries-cloudagent-python/pull/127) +- Handle duplicate schema in send_schema by always fetching first [#126](https://github.com/hyperledger/aries-cloudagent-python/pull/126) +- More flexible timeout support in detect_process [#125](https://github.com/hyperledger/aries-cloudagent-python/pull/125) +- Add start command to run_docker invocations [#119](https://github.com/hyperledger/aries-cloudagent-python/pull/119) +- Add issuer stored state [#114](https://github.com/hyperledger/aries-cloudagent-python/pull/114) +- Add admin route to create a presentation request without sending it [#112](https://github.com/hyperledger/aries-cloudagent-python/pull/112) +- Add -v option to aca-py executable to print version [#110](https://github.com/hyperledger/aries-cloudagent-python/pull/110) +- Fix demo presentation request, optimize credential retrieval [#108](https://github.com/hyperledger/aries-cloudagent-python/pull/108) +- Add pypi badge to README and make document link URLs absolute [#103](https://github.com/hyperledger/aries-cloudagent-python/pull/103) +- Add admin routes for creating and listing wallet DIDs, adjusting the public DID [#102](https://github.com/hyperledger/aries-cloudagent-python/pull/102) +- Update the running locally instructions based on feedback from Sam Smith [#101](https://github.com/hyperledger/aries-cloudagent-python/pull/101) +- Add support for multiple invocation commands, implement start/provision/help commands [#99](https://github.com/hyperledger/aries-cloudagent-python/pull/99) +- Add admin endpoint to send problem report [#98](https://github.com/hyperledger/aries-cloudagent-python/pull/98) +- Add credential received state transition [#97](https://github.com/hyperledger/aries-cloudagent-python/pull/97) +- Adding documentation for the routing version of the performance example [#94](https://github.com/hyperledger/aries-cloudagent-python/pull/94) +- Document listing the Aries RFCs supported by ACA-Py and reference to the list in the README [#89](https://github.com/hyperledger/aries-cloudagent-python/pull/89) +- Further updates to the running locally section of the demo README [#86](https://github.com/hyperledger/aries-cloudagent-python/pull/86) +- Don't extract decorators with names matching the 'data_key' of defined schema fields [#85](https://github.com/hyperledger/aries-cloudagent-python/pull/85) +- Allow demo scripts to run outside of Docker; add command line parsing [#84](https://github.com/hyperledger/aries-cloudagent-python/pull/84) +- Connection invitation fixes and improvements; support DID-based invitations [#82](https://github.com/hyperledger/aries-cloudagent-python/pull/82) + # 0.2.1 ## July 16, 2019 From f7fea5b9663160c735b9084923d903e6ced76f83 Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Thu, 8 Aug 2019 20:31:27 -0700 Subject: [PATCH 5/5] add notes on updating CHANGELOG.md Signed-off-by: Andrew Whitehead --- PUBLISHING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PUBLISHING.md b/PUBLISHING.md index 235799f6a6..9b51e50d16 100644 --- a/PUBLISHING.md +++ b/PUBLISHING.md @@ -2,10 +2,12 @@ 0. The code to be published should be in the `master` branch. -1. Update the version number listed in [aries_cloudagent/version.py](aries_cloudagent/version.py). The incremented version number should adhere to the [Semantic Versioning Specification](https://semver.org/#semantic-versioning-specification-semver) based on the changes since the last published release. +1. Update CHANGELOG.md to include details of the closed PRs included in this release. -2. Create a new GitHub release. The tag name and title of the release should be the same as the version in [aries_cloudagent/version.py](aries_cloudagent/version.py). +2. Update the version number listed in [aries_cloudagent/version.py](aries_cloudagent/version.py). The incremented version number should adhere to the [Semantic Versioning Specification](https://semver.org/#semantic-versioning-specification-semver) based on the changes since the last published release. -3. Create a new [distribution package](https://packaging.python.org/glossary/#term-distribution-package) with `python setup.py sdist bdist_wheel`. +3. Create a new GitHub release. The tag name and title of the release should be the same as the version in [aries_cloudagent/version.py](aries_cloudagent/version.py). Include the additions to CHANGELOG.md in the release notes. -4. Publish the release to [PyPI](https://pypi.org) using [twine](https://pypi.org/project/twine/) with `twine upload dist/*`. +4. Create a new [distribution package](https://packaging.python.org/glossary/#term-distribution-package) with `python setup.py sdist bdist_wheel` + +5. Publish the release to [PyPI](https://pypi.org) using [twine](https://pypi.org/project/twine/) with `twine upload dist/*`