Merge branch 'release/v1.5' into develop

beyond-blockchain · Nov 26, 2019 · 731e1d4 · 731e1d4
2 parents 44f0301 + f0cabb1
commit 731e1d4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -72,11 +72,6 @@ jobs:
             pytest test_pending_request.py
             pytest test_bbc_ping.py
             pytest test_bbc_stats.py
-            cd compat
-            pytest test_bbc_app_multi_core_many_transactions_bson.py
-            pytest test_bbc_app_multiclient_traverse_bson.py
-            pytest test_bbc_app_multi_core_compat.py
-            pytest test_bbclib_bson.py
       - save_cache:
           key: v1-dependency-cache-{{ checksum "setup.py" }}
           paths:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change log
 ======
 
+## v1.5
+* Support BBcAssetRaw and BBcAssetHash defined in py-bbclib v1.5 or later
+* bug fix
+
 ## v1.4
 * Decouple bbclib from bbc1/core
   * import py-bbclib

diff --git a/README.md b/README.md
@@ -96,6 +96,8 @@ Some documents are available in docs/.
     * [how_to_use_in_nat_environment.md](docs/how_to_use_in_nat_environment.md)
     * [libbbcsig_dll_build_for_Windows_x64_ja.md](docs/libbbcsig_dll_build_for_Windows_x64_ja.md)
 * Programing
+    * [BBc1_pybbclib_programming_guide_v1.6_ja.md](https://github.com/beyond-blockchain/py-bbclib/blob/develop/docs/BBc1_pybbclib_programming_guide_v1.6_ja.md)
+    * [BBc1_pybbclib_utility_functions_v1.6_ja.md](https://github.com/beyond-blockchain/py-bbclib/blob/develop/docs/BBc1_pybbclib_utility_functions_v1.6_ja.md)
     * [BBc1_pybbclib_programming_guide_v1.4.1_ja.md](docs/BBc1_pybbclib_programming_guide_v1.4.1_ja.md)
     * [BBc1_programming_guide_v1.3_ja.md](docs/BBc1_programming_guide_v1.3_ja.md)
     * [BBc1_core_tutorial_file_proof_ja.md](docs/BBc1_core_tutorial_file_proof_ja.md)

diff --git a/README.rst b/README.rst
@@ -53,7 +53,7 @@ Disabling cache and re-installing the module is another solution, which is easie
 ```bash
 python3 -mvenv venv
 . venv/bin/activate
-pip --no-cache-dir install -I bbc1
+pip --no-cache-dir install -I bbc1 
 ```
 
 
@@ -96,6 +96,8 @@ Some documents are available in docs/.
     * [how_to_use_in_nat_environment.md](docs/how_to_use_in_nat_environment.md)
     * [libbbcsig_dll_build_for_Windows_x64_ja.md](docs/libbbcsig_dll_build_for_Windows_x64_ja.md)
 * Programing
+    * [BBc1_pybbclib_programming_guide_v1.6_ja.md](https://github.com/beyond-blockchain/py-bbclib/blob/develop/docs/BBc1_pybbclib_programming_guide_v1.6_ja.md)
+    * [BBc1_pybbclib_utility_functions_v1.6_ja.md](https://github.com/beyond-blockchain/py-bbclib/blob/develop/docs/BBc1_pybbclib_utility_functions_v1.6_ja.md)
     * [BBc1_pybbclib_programming_guide_v1.4.1_ja.md](docs/BBc1_pybbclib_programming_guide_v1.4.1_ja.md)
     * [BBc1_programming_guide_v1.3_ja.md](docs/BBc1_programming_guide_v1.3_ja.md)
     * [BBc1_core_tutorial_file_proof_ja.md](docs/BBc1_core_tutorial_file_proof_ja.md)

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ requests>=2.12.4
 gevent>=1.2.1
 greenlet
 cryptography>=2.1.4
-pytest<=3.2.*,>=3.0.5
+pytest>=5.3.0
 py-bbclib>=1.6
 msgpack-python>=0.4.8
 mysql-connector-python>=8.0.5

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup
 from setuptools.command.install import install
 
-VERSION = "1.4"
+VERSION = "1.5"
 
 here = path.abspath(path.dirname(__file__))
 
@@ -45,10 +45,10 @@ def run(self):
                  'requests>=2.12.4',
                  'gevent>=1.2.1',
                  'cryptography>=2.1.4',
-                 'pytest<=3.2.*,>=3.0.5',
+                 'pytest>=5.3.0',
                  'msgpack-python>=0.4.8',
                  'mysql-connector-python>=8.0.5',
-                 'py-bbclib>=1.4.1',
+                 'py-bbclib>=1.6',
                  'greenlet',
                  'bson',
                  'Flask>=0.10.1,<=1.0.1'