Skip to content

Commit d9ceeca

Browse files
committed
Merge branch 'release/v0.9.6'
2 parents cb518cf + 5bdef85 commit d9ceeca

File tree

6 files changed

+35
-11
lines changed

6 files changed

+35
-11
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
docs/build/
2+
src/__pycache__/

.hgignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/source/changelog.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Changelog
22
=========
33

4+
Version 0.9.6
5+
-------------
6+
7+
*Release date: 2019/08/29*
8+
9+
* new: exit gracefully if py3bencode module could not be imported and show
10+
instructions on how to fix this
11+
* docs: Updated docs after migration from Mercurial/Bitbucket.org to Git/Github.com
12+
413
Version 0.9.5
514
-------------
615

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
# built documents.
4949
#
5050
# The short X.Y version.
51-
version = '1.0'
51+
version = '0.9'
5252
# The full version, including alpha/beta/rc tags.
53-
release = '1.0.0-dev'
53+
release = '0.9.6'
5454

5555
# The language for content autogenerated by Sphinx. Refer to documentation
5656
# for a list of supported languages.

docs/source/user.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ py3createtorrent is intended to fill this gap.
2929
Requirements
3030
------------
3131

32-
py3createtorrent requires at least Python 3.1 and the `py3bencode <https://bitbucket.org/rsnitsch/py3bencode>`_ module.
32+
py3createtorrent requires at least Python 3.1 and the `py3bencode <https://github.com/rsnitsch/py3bencode>`_ module.
3333

3434
Installation
3535
------------
3636

3737
Download the desired version from here:
38-
https://bitbucket.org/rsnitsch/py3createtorrent/downloads
38+
https://github.com/rsnitsch/py3createtorrent/releases
3939

4040
The required py3bencode module is shipped alongside py3createtorrent. As long
4141
as you extract py3bencode into the same directory as the py3createtorrent script,
@@ -51,15 +51,15 @@ Python installation.
5151
You can use `pip <http://www.pip-installer.org/>`_ to install the py3bencode
5252
module in your Python installation (in the site-packages, to be precise)::
5353

54-
pip install hg+https://bitbucket.org/rsnitsch/py3bencode
54+
pip install git+https://github.com/rsnitsch/py3bencode
5555

5656
Make sure to use the pip executable that belongs to the Python interpreter
5757
with which you will execute py3createtorrent.
5858

5959
If you don't have pip around (although I strongly recommend using it) you can
6060
also try to install py3bencode manually::
6161

62-
$ hg clone https://bitbucket.org/rsnitsch/py3bencode
62+
$ git clone https://github.com/rsnitsch/py3bencode
6363
$ cd py3bencode
6464
$ python3 setup.py install
6565

src/py3createtorrent.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,23 @@
1515
import sys
1616
import time
1717

18-
from py3bencode import bencode
18+
try:
19+
from py3bencode import bencode
20+
except ImportError as exc:
21+
print("ERROR:")
22+
print("""py3bencode module could not be imported.
23+
24+
Please install the py3bencode module using
25+
26+
pip install git+https://github.com/rsnitsch/py3bencode
27+
28+
or refer to the documentation on how to install it:
29+
https://py3createtorrent.readthedocs.io/en/latest/""")
30+
print()
31+
print()
32+
print("-"*40)
33+
print()
34+
raise
1935

2036
__all__ = ['calculate_piece_length',
2137
'get_files_in_directory',
@@ -39,7 +55,7 @@
3955
# do not touch anything below this line unless you know what you're doing!
4056

4157

42-
VERSION = '1.0.0-dev'
58+
VERSION = '0.9.6'
4359

4460
# Note:
4561
# Kilobyte = kB = 1000 Bytes

0 commit comments

Comments
 (0)