Add PEP-396 compatible module's __version__

diff --git a/VERSION b/VERSION
index 5186d07068cfed4c3f4705df79c73e115dd35c43..7d5c902e777905446c67de7e52a945b88fd2038c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.1

diff --git a/download.texi b/download.texi
index 1439b055220e0a0c6ebe703d8a47b9a8ebeee37f..6dd1efb4401585dffea8b5704b6fe9e38ed10cc0 100644 (file)
--- a/download.texi
+++ b/download.texi
@@ -1,18 +1,20 @@
 @node Download
 @unnumbered Download
 
+@set VERSION 4.1
+
 No additional dependencies except Python 2.7/3.x interpreter are required.
 
 Preferable way is to download tarball with the signature:
 
-@verbatim
-$ wget http://pygost.cypherpunks.ru/pygost-4.0.tar.xz
-$ wget http://pygost.cypherpunks.ru/pygost-4.0.tar.xz.sig
-$ gpg --verify pygost-4.0.tar.xz.sig pygost-4.0.tar.xz
-$ xz -d < pygost-4.0.tar.xz | tar xf -
-$ cd pygost-4.0
+@example
+$ [fetch|wget] http://pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz
+$ [fetch|wget] http://pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz.sig
+$ gpg --verify pygost-@value{VERSION}.tar.xz.sig pygost-@value{VERSION}.tar.xz
+$ xz --decompress --stdout pygost-@value{VERSION}.tar.xz | tar xf -
+$ cd pygost-@value{VERSION}
 $ python setup.py install
-@end verbatim
+@end example
 
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum @tab Streebog-256 checksum
@@ -92,11 +94,15 @@ $ python setup.py install
 
 @end multitable
 
-But also you can use PIP (@strong{no} authentication is performed!):
+But also you can use pip (@strong{no} OpenPGP authentication is
+performed!) with PyPI:
 
-@verbatim
-$ pip install pygost==3.15
-@end verbatim
+@example
+$ cat > requirements.txt <<EOF
+pygost==@value{VERSION} --hash=sha256:TODO
+EOF
+$ pip install --requirement requirements.txt
+@end example
 
 You @strong{have to} verify downloaded tarballs integrity and
 authenticity to be sure that you retrieved trusted and untampered
@@ -118,10 +124,10 @@ uid   PyGOST releases <pygost at cypherpunks dot ru>
 @item @url{https://lists.cypherpunks.ru/mailman/listinfo/gost, gost} maillist
 
 @item
-@verbatim
+@example
 $ gpg --auto-key-locate dane --locate-keys pygost at cypherpunks dot ru
 $ gpg --auto-key-locate wkd --locate-keys pygost at cypherpunks dot ru
-@end verbatim
+@end example
 
 @item
 @verbatiminclude PUBKEY.asc

diff --git a/news.texi b/news.texi
index b1bf15ce64ab8501834c780f5baaaf1c57b4af0f..852e836ecc6bdbe4e32a1511be90bdfabcad4693 100644 (file)
--- a/news.texi
+++ b/news.texi
@@ -3,6 +3,22 @@
 
 @table @strong
 
+@anchor{Release 4.1}
+@item 4.1
+    @itemize
+    @item PEP-396 compatible module's @code{__version__}
+    @item Curve parameters aliases:
+@verbatim
+id-GostR3410-2001-CryptoPro-XchA-ParamSet -> id-GostR3410-2001-CryptoPro-A-ParamSet
+id-GostR3410-2001-CryptoPro-XchB-ParamSet -> id-GostR3410-2001-CryptoPro-C-ParamSet
+id-tc26-gost-3410-2012-256-paramSetB      -> id-GostR3410-2001-CryptoPro-A-ParamSet
+id-tc26-gost-3410-2012-256-paramSetC      -> id-GostR3410-2001-CryptoPro-B-ParamSet
+id-tc26-gost-3410-2012-256-paramSetD      -> id-GostR3410-2001-CryptoPro-C-ParamSet
+@end verbatim
+    @item Forbid any later GNU GPL version autousage (project's licence
+        now is GNU GPLv3 only)
+    @end itemize
+
 @anchor{Release 4.0}
 @item 4.0
     @itemize

diff --git a/pygost/__init__.py b/pygost/__init__.py
index 82c1d4324a34affa77cc94b720f72775e552476a..4991c375a71b84d28ff3a2ad5646c52a37ce83ec 100644 (file)
--- a/pygost/__init__.py
+++ b/pygost/__init__.py
@@ -2,3 +2,5 @@
 
 PyGOST is free software: see the file COPYING for copying conditions.
 """
+
+__version__ = "4.1"

diff --git a/www.texi b/www.texi
index 86bc3efa8c3ea60b9493dc0f5e9128533ef3e645..4248b501ecdf2ecb2e919be808eacee2b7ba38fc 100644 (file)
--- a/www.texi
+++ b/www.texi
@@ -60,7 +60,7 @@ Currently supported algorithms are:
 
 Example 34.10-2012 keypair generation, signing and verifying:
 
-@verbatim
+@example
 >>> from pygost.gost3410 import CURVES
 >>> curve = CURVES["id-tc26-gost-3410-12-512-paramSetA"]
 >>> from os import urandom
@@ -80,7 +80,7 @@ Example 34.10-2012 keypair generation, signing and verifying:
 >>> from pygost.gost3410 import verify
 >>> verify(curve, pub, dgst, signature, mode=2012)
 True
-@end verbatim
+@end example
 
 Please send questions, bug reports and patches to
 @url{https://lists.cypherpunks.ru/mailman/listinfo/gost, gost}