BUG: Fix Travis error History.rst

shaneahmed · shaneahmed · commit f06b65900bdf · 2020-06-01T16:33:49.000+01:00
Update feature branch according to develop branch to fix the error.
diff --git a/.travis.yml b/.travis.yml
@@ -17,12 +17,24 @@ script: tox
 # following command to finish PyPI deployment setup:
 # $ travis encrypt --add deploy.password
 deploy:
-  provider: pypi
-  distributions: sdist bdist_wheel
-  user: tialab
-  password:
-    secure: PLEASE_REPLACE_ME
-  on:
-    tags: true
-    repo: tialab/tiatoolbox
-    python: 3.8
+  - provider: pypi
+    server: https://test.pypi.org/legacy/
+    distributions: sdist bdist_wheel
+    user: __token__
+    password:
+      secure: a5EoBz4NAQWB0EmgQCKpDRtISy76uNt2dWYZURzTW5v7V2GHyP+drNDWW5HNN0qoLK8pYXBGS47DqJtNDD0+k4G1ogINQKTENWI/oAxXrI8mwAAEhp+2uhHBGSWUX0jlnfRD3VX3M4zSy0DEszGONrJMiJyfRAKNa+P1FPp7AFjRKh8keivCLXgL3Y27OfyBKf4wgy/EnlK2P/BkO9fhPLfDNdBAXikrOCTmG7b0MIRpSXdOqtgo0QtR8t2tQnekke14iH4oTlhEMq2+X875Fejg3n686mXvmTrenLNyZiO0PW4MXAsc5PEES3F2yyLVyk9tHhp54eBErhg60jr2q5GqkX+QBA9wooXcWoLdB+fKJbv4I4XtiMQ68B/1RLvQwWTUjMp520eFBc1dD3HiCEj0KuoplaxFWAgJoAAawC6/TrSpACgb1Cw1M5XcOb3dzUN4hduuvYp8emcixmc0mufrK1QU62u9320rMMF7HZJuLCg4GVHryWqBlc6u6kQrmnF+xU36ms0Deamjzb96TfA2W+DEG2N2dtxmbYEIaLyKZnpLhCV5FZDai4AK5nW9Hst6w/dDU7kYiHwM962ArEKApFuoF4mbNJe3EALR2xlNINZRaEqY+XPXtjODY7g/3bajsDfxEjKB9RTBxq9mL49ioxlXGRTvS7VhU+n6BE0=
+    on:
+      branch: develop
+      tags: true
+      repo: TIA-Lab/tiatoolbox
+      python: 3.8
+  - provider: pypi
+    distributions: sdist bdist_wheel
+    user: __token__
+    password:
+      secure: RibR6mwteL0ZT21Yd0yaWEbG2ArBZlCIA1W7QMlr0BXDbI03+99t90wVsOI6PZIQKaR/yUvU0unEz5dsBzvIAXcDbJADb2NHqn+OPZlIw+kjSU3wPUYxQZzUEemwaSuNMnVLjC1weOdazGyV4zt9kUiT/pIiZFSTFj7K5C6Tjta283UrAv4LBzOPZNJvdi5oqfuSWNmgWzTm2mTOBwnFxJTvMTBDMl8GRMhjb3zAD/4eQKpiSMItJoqpte924jcWWDfgTMGWzhP5KKm7WurkbT/j0R8Px6V/Zhfx82JUy7qMeJRu/5AdQaCd4tjkAPRhKx+z84Dm8EFhRkv1dVeQMSUMu91ejRIRLu4UmN8zplRGcpDjUZwv/j+62EswhN66cb80SczhuBYy0tmI6BOl4+h3oMivojHC6zcbgkaswwS5IGRCf7lY/grFvrEhJVX+c7aRi6/ZvsrO72XwO0OaoOxdwPW7sJZPkn+92DH/bMRe9sUb0PrxWvfHqYdtRGmf3i/NHcZli7Simrn5s6eS3AM8BGL2ZwUs9dmiP0pAj9FhfZNp5nyxQeoTcNgnZBamQk6liZMAW1DYGzLg/U11bsprt8pM5lzJR3G/zwCIgfBn37kg3JL9wkO5M/8eEJ8ADCkx/MeyUMzv2gm8R+jb5fFd8eTQhlpLuXZlxUZiKyA=
+    on:
+      branch: master
+      tags: true
+      repo: TIA-Lab/tiatoolbox
+      python: 3.8
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,8 +1,8 @@
-include AUTHORS.md
-include CONTRIBUTING.md
-include HISTORY.md
+include AUTHORS.rst
+include CONTRIBUTING.rst
+include HISTORY.rst
 include LICENSE
-include README.md
+include README.rst
 
 recursive-include tests *
 recursive-exclude * __pycache__
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -14,4 +14,3 @@ pytest-runner==5.1
 opencv-python==4.2.0.34
 pathos==0.2.5
 openslide-python==1.1.1
-
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
@@ -47,6 +47,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/tialab/tiatoolbox",
-    version="0.1.0",
+    version="0.1.1",
     zip_safe=False,
 )
diff --git a/tiatoolbox/__init__.py b/tiatoolbox/__init__.py
@@ -7,4 +7,4 @@
 
 __author__ = """TIA Lab"""
 __email__ = "tialab@dcs.warwick.ac.uk"
-__version__ = "0.1.0"
+__version__ = "0.1.1"
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,11 @@
 [tox]
-envlist = py35, py36, py37, py38, flake8
+envlist = py36, py37, py38, flake8
 
 [travis]
 python =
     3.8: py38
     3.7: py37
     3.6: py36
-    3.5: py35
 
 [testenv:flake8]
 basepython = python

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@`
`47`	`47`	`test_suite="tests",`
`48`	`48`	`tests_require=test_requirements,`
`49`	`49`	`url="https://github.com/tialab/tiatoolbox",`
`50`		`- version="0.1.0",`
	`50`	`+ version="0.1.1",`
`51`	`51`	`zip_safe=False,`
`52`	`52`	`)`