refractor

.docs/README_template.rst

@@ -1,4 +1,4 @@
-Version 2.0.6 as of 2020-07-31, see changelog_
+Version v2.0.7 as of 2020-07-31, see changelog_
 
 =======================================================
 

CHANGES.rst

@@ -5,76 +5,76 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
+v2.0.7
+---------
+2020-07-31: fix travis build
 
-2.0.6
--------
+v2.0.6
+---------
 2020-07-31: fix environ.pop issue in doctest
 
-
-2.0.5
--------
+v2.0.5
+---------
 2020-07-29: feature release
     - use the new pizzacutter template
     - use cli_exit_tools
 
-2.0.4
------
+v2.0.4
+---------
 2020-07-23: patch release
     - adopt lib_log_utils 0.3.0
 
-2.0.3
------
+v2.0.3
+---------
 2020-07-16: feature release
     - fix cli test
     - enable traceback option on cli errors
 
-2.0.2
------
+v2.0.2
+---------
 2020-07-16: patch release
     - fix cli test
     - enable traceback option on cli errors
 
-2.0.1
------
+v2.0.1
+---------
 2020-07-05 : patch release
     - fix typos
     - manage project with PizzaCutter
     - restructured cli entry points
 
-2.0.0
------
+v2.0.0
+---------
 2020-06-19
-
-- new CLI Interface
-- avoid recursive imports
-- manage the project with lib_travis_template
-
-
-1.0.9
------
-- drop support for configfiles
-- update documentation
-- implement --version on commandline
-- test commandline registration
-- strict mypy typechecking
+    - new CLI Interface
+    - avoid recursive imports
+    - manage the project with lib_travis_template
+
+v1.0.9
+---------
+    - drop support for configfiles
+    - update documentation
+    - implement --version on commandline
+    - test commandline registration
+    - strict mypy typechecking
 
 1.0.8
------
-- drop python 2.7 / 3.4 support
-- implement --inplace option
-- implement --quiet option
-- implement multiline string replacement
-- extend documentation
+---------
+    - drop python 2.7 / 3.4 support
+    - implement --inplace option
+    - implement --quiet option
+    - implement multiline string replacement
+    - extend documentation
 
 
 1.0.2
------
+---------
 2019-04-28: fix import errors
 
 1.0.1
------
+---------
 2019-04-28: add empty line at the end of the assembled documentation, to be able to add CHANGES.rst with setup.py
 
 1.0.0
------
+---------
 2019-04-19: Initial public release, PyPi Release

README.rst

@@ -1,4 +1,4 @@
-Version 2.0.6 as of 2020-07-31, see changelog_
+Version v2.0.7 as of 2020-07-31, see changelog_
 
 =======================================================
 
@@ -493,77 +493,77 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
+v2.0.7
+---------
+2020-07-31: fix travis build
 
-2.0.6
--------
+v2.0.6
+---------
 2020-07-31: fix environ.pop issue in doctest
 
-
-2.0.5
--------
+v2.0.5
+---------
 2020-07-29: feature release
     - use the new pizzacutter template
     - use cli_exit_tools
 
-2.0.4
------
+v2.0.4
+---------
 2020-07-23: patch release
     - adopt lib_log_utils 0.3.0
 
-2.0.3
------
+v2.0.3
+---------
 2020-07-16: feature release
     - fix cli test
     - enable traceback option on cli errors
 
-2.0.2
------
+v2.0.2
+---------
 2020-07-16: patch release
     - fix cli test
     - enable traceback option on cli errors
 
-2.0.1
------
+v2.0.1
+---------
 2020-07-05 : patch release
     - fix typos
     - manage project with PizzaCutter
     - restructured cli entry points
 
-2.0.0
------
+v2.0.0
+---------
 2020-06-19
-
-- new CLI Interface
-- avoid recursive imports
-- manage the project with lib_travis_template
-
-
-1.0.9
------
-- drop support for configfiles
-- update documentation
-- implement --version on commandline
-- test commandline registration
-- strict mypy typechecking
+    - new CLI Interface
+    - avoid recursive imports
+    - manage the project with lib_travis_template
+
+v1.0.9
+---------
+    - drop support for configfiles
+    - update documentation
+    - implement --version on commandline
+    - test commandline registration
+    - strict mypy typechecking
 
 1.0.8
------
-- drop python 2.7 / 3.4 support
-- implement --inplace option
-- implement --quiet option
-- implement multiline string replacement
-- extend documentation
+---------
+    - drop python 2.7 / 3.4 support
+    - implement --inplace option
+    - implement --quiet option
+    - implement multiline string replacement
+    - extend documentation
 
 
 1.0.2
------
+---------
 2019-04-28: fix import errors
 
 1.0.1
------
+---------
 2019-04-28: add empty line at the end of the assembled documentation, to be able to add CHANGES.rst with setup.py
 
 1.0.0
------
+---------
 2019-04-19: Initial public release, PyPi Release
 

rst_include/__init__conf__.py

@@ -1,6 +1,6 @@
 name = 'rst_include'
 title = 'commandline tool to resolve RST File includes'
-version = '2.0.6'
+version = 'v2.0.7'
 url = 'https://github.com/bitranox/rst_include'
 author = 'Robert Nowotny'
 author_email = '[email protected]'
@@ -14,7 +14,7 @@ def print_info() -> None:
 
     commandline tool to resolve RST File includes
 
-    Version : 2.0.6
+    Version : v2.0.7
     Url     : https://github.com/bitranox/rst_include
     Author  : Robert Nowotny
     Email   : [email protected]""")

setup.py

@@ -80,13 +80,15 @@ def get_line_data(line: str) -> str:
 install_requires = get_requirements_from_file('requirements.txt')
 setup_requires = list(set(tests_require + install_requires))
 
-setup_requires = strip_links_from_required(setup_requires)
-tests_require = strip_links_from_required(tests_require)
-install_requires = strip_links_from_required(install_requires)
+# for deploy on pypi we must not rely on imports from github
+if is_travis_deploy() and is_tagged_commit():
+    setup_requires = strip_links_from_required(setup_requires)
+    tests_require = strip_links_from_required(tests_require)
+    install_requires = strip_links_from_required(install_requires)
 
 setup_kwargs: Dict[str, Any] = dict()
 setup_kwargs['name'] = 'rst_include'
-setup_kwargs['version'] = '2.0.6'
+setup_kwargs['version'] = 'v2.0.7'
 setup_kwargs['url'] = 'https://github.com/bitranox/rst_include'
 setup_kwargs['packages'] = find_packages()
 setup_kwargs['package_data'] = {'rst_include': ['py.typed', '*.pyi', '__init__.pyi']}