Merge pull request #910 from jookies/0.10

0.10.4
jookies · Oct 21, 2020 · 1c13330 · 1c13330
2 parents 3acbea2 + 243a221
commit 1c13330
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ python:
     - '3.8'
 #    - '3.9'
 env:
-    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.10.2
+    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.10.4
 # Command to install dependencies
 install:
     - pip install -r requirements.txt

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,9 +1,10 @@
 # Source distribution files.
 include README.rst
 include LICENSE
-include *-requirements
+include requirements.txt
+include requirements-test.txt
 recursive-include misc *
 
 # Prune stray bytecode files.
 global-exclude *.pyc
-prune misc/doc/build
+prune misc/doc/build
diff --git a/README.rst b/README.rst
@@ -70,7 +70,7 @@ Credits
 * SMPP 3.4 Client based on smpp.twisted: https://github.com/mozes/smpp.twisted
 * GSMP 3.38 based on Python messaging: https://github.com/pmarti/python-messaging
 
-.. |ci| image:: https://api.travis-ci.org/jookies/jasmin.png
+.. |ci| image:: https://api.travis-ci.org/jookies/jasmin.png?branch=master
     :alt: Build status
     :scale: 100%
     :target: https://travis-ci.org/jookies/jasmin

diff --git a/jasmin/__init__.py b/jasmin/__init__.py
@@ -5,7 +5,7 @@
 
 MAJOR = 0
 MINOR = 10
-PATCH = 2
+PATCH = 4
 META = ''
 
 

diff --git a/misc/doc/sources/conf.py b/misc/doc/sources/conf.py
@@ -38,7 +38,7 @@
 # The short X.Y version.
 version = "0.10"
 # The full version, including alpha/beta/rc tags.
-release = "0.10.2"
+release = "0.10.4"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/requirements.txt b/requirements.txt
@@ -12,11 +12,10 @@ falcon~=2.0.0
 txredisapi~=1.4.7
 tabulate~=0.8.7
 
-txAMQP @ git+https://github.com/jookies/txamqp.git@master
-smpp.pdu @ git+https://github.com/jookies/smpp.pdu.git@master
-smpp.twisted @ git+https://github.com/jookies/smpp.twisted.git@master
-python-messaging @ git+https://github.com/jookies/python-messaging.git@master
-
+txAMQP3~=0.9.0
+smpp.pdu3~=0.4
+smpp.twisted3~=0.6
+python-messaging~=0.5.13
 
 # Added in 0.9rc16:
 celery>=4.0.0

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@ def parse_requirements(filename):
 
 setup(
     name="jasmin",
-    version='0.10.2',
+    version='0.10.4',
     author="Jookies LTD",
     author_email="jasmin@jookies.net",
     url="http://www.jasminsms.com",