Merge with master branch

1200wd · Jun 3, 2024 · 0a07438 · 0a07438
2 parents 33dd52d + 2d7e2f2
commit 0a07438
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+RELEASE 0.6.15 - Small bugfixes, documentation updates
+======================================================
+* Some small bugfixes
+* New properties for WalletKey class for multisig wallets
+* Add Bcoin documentation, add FAQ, update other documentation
+* Add dockerfile for Linux Mint
+
 RELEASE 0.6.14 - Update installation instruction, docker & bugfixes
 ===================================================================
 * Update installation instructions

diff --git a/bitcoinlib/config/VERSION b/bitcoinlib/config/VERSION
@@ -1 +1 @@
-0.6.14
+0.6.15
diff --git a/docs/conf.py b/docs/conf.py
@@ -45,7 +45,7 @@
 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.14'
+release = '0.6.15'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,6 +2,6 @@ requests>=2.25.0
 SQLAlchemy>=2.0.0
 fastecdsa>=2.2.1
 sphinx>=6.0.0
-sphinx_rtd_theme>=1.0.0
+sphinx_rtd_theme>=2.0.0
 numpy>=1.22.0
-pycryptodome>=3.14.1
+pycryptodome>=3.16.0
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = bitcoinlib
-version = 0.6.14
+version = 0.6.15
 url = http://github.com/1200wd/bitcoinlib
 author = 1200wd
 author_email = [email protected]

diff --git a/tests/bitcoinlib_encrypted.db b/tests/bitcoinlib_encrypted.db