Merge pull request #5 from bitranox/development

2.0.3

CHANGES.rst

@@ -5,13 +5,18 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
+2.0.3
+-----
+2020-07-16: feature release
+    - fix cli test
+    - enable traceback option on cli errors
+
 2.0.2
 -----
 2020-07-16: Patch release
     - fix cli test
     - enable traceback option on cli errors
 
-
 2.0.1
 -----
 2020-07-05 : patch release

README.rst

@@ -459,10 +459,9 @@ following modules will be automatically installed :
 
     ## Project Requirements
     click
-    pathlib3x @ git+https://github.com/bitranox/pathlib3x.git
     lib_list @ git+https://github.com/bitranox/lib_list.git
     lib_log_utils @ git+https://github.com/bitranox/lib_log_utils.git
-    lib_path @ git+https://github.com/bitranox/lib_path.git
+    pathlib3x @ git+https://github.com/bitranox/pathlib3x.git
 
 Acknowledgements
 ----------------
@@ -489,13 +488,18 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
+2.0.3
+-----
+2020-07-16: feature release
+    - fix cli test
+    - enable traceback option on cli errors
+
 2.0.2
 -----
 2020-07-16: Patch release
     - fix cli test
     - enable traceback option on cli errors
 
-
 2.0.1
 -----
 2020-07-05 : patch release

requirements.txt

@@ -1,6 +1,5 @@
 ## Project Requirements
 click
-pathlib3x @ git+https://github.com/bitranox/pathlib3x.git
 lib_list @ git+https://github.com/bitranox/lib_list.git
 lib_log_utils @ git+https://github.com/bitranox/lib_log_utils.git
-lib_path @ git+https://github.com/bitranox/lib_path.git
+pathlib3x @ git+https://github.com/bitranox/pathlib3x.git

rst_include.ipynb

@@ -0,0 +1,62 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "outputs": [],
+   "source": [
+    "# update pip and setuptools\n",
+    "import sys\n",
+    "!{sys.executable} -m pip install --upgrade pip\n",
+    "!{sys.executable} -m pip install --upgrade setuptools\n",
+    "\n",
+    "# install rst_include from pypi\n",
+    "!{sys.executable} -m pip install --upgrade rst_include\n",
+    "\n",
+    "# install rst_include from github\n",
+    "!{sys.executable} -m pip install --upgrade git+https://github.com/bitranox/rst_include.git"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "metadata": {
+    "trusted": true,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
+   "cell_type": "code",
+   "source": [
+    "import rst_include"
+   ],
+   "execution_count": null,
+   "outputs": []
+  }
+ ],
+ "metadata": {
+  "language_info": {
+   "name": "python",
+   "version": "3.7.6",
+   "mimetype": "text/x-python",
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "pygments_lexer": "ipython3",
+   "nbconvert_exporter": "python",
+   "file_extension": ".py"
+  },
+  "kernelspec": {
+   "name": "python3",
+   "display_name": "Python 3",
+   "language": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

rst_include/__init__conf__.py

@@ -1,6 +1,6 @@
 name = 'rst_include'
 title = 'commandline tool to resolve RST File includes'
-version = '2.0.2'
+version = '2.0.3'
 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.2
+    Version : 2.0.3
     Url     : https://github.com/bitranox/rst_include
     Author  : Robert Nowotny
     Email   : [email protected]""")

rst_include/libs/lib_assemble_block.py

@@ -1,9 +1,9 @@
 # STDLIB
-import pathlib3x as pathlib
 from typing import List, IO, Union
 
 # OWN
-import lib_list     # type: ignore
+import lib_list
+import pathlib3x as pathlib
 
 
 try:

rst_include/libs/lib_block.py

@@ -1,9 +1,9 @@
 # STDLIB
-import pathlib3x as pathlib
 from typing import List
 
 # OWN
-import lib_list  # type: ignore
+import lib_list
+import pathlib3x as pathlib
 
 try:
     # for pytest

rst_include/libs/lib_block_options.py

@@ -1,5 +1,7 @@
-import lib_log_utils    # type: ignore
+# OWN
+import lib_log_utils
 
+# PROJ
 try:
     # for pytest
     from . import lib_classes

rst_include/libs/lib_check_files.py

@@ -1,10 +1,10 @@
 # STDLIB
 from io import TextIOWrapper
-import pathlib3x as pathlib
 from typing import List, IO, Tuple, Union
 
 # OWN
-import lib_log_utils    # type: ignore
+import lib_log_utils
+import pathlib3x as pathlib
 
 # PROJECT
 try:

rst_include/libs/lib_classes.py

@@ -1,6 +1,9 @@
-import pathlib3x as pathlib
+# STDLIB
 from typing import List, IO, Union
 
+# OWN
+import pathlib3x as pathlib
+
 
 class RstFile(object):
     def __init__(self,

rst_include/libs/lib_get_include_options.py

@@ -1,10 +1,9 @@
 # STDLIB
-import pathlib3x as pathlib
 from typing import List, Tuple, Union
 
 # OWN
-import lib_log_utils    # type: ignore
-import lib_path         # type: ignore
+import lib_log_utils
+import pathlib3x as pathlib
 
 try:
     # for pytest

rst_include/libs/lib_include_file.py

@@ -1,12 +1,12 @@
 # STDLIB
 from collections import OrderedDict
-import pathlib3x as pathlib
 from typing import List, Union, IO
 
 
 # OWN
-import lib_list         # type: ignore
-import lib_log_utils    # type: ignore
+import lib_list
+import lib_log_utils
+import pathlib3x as pathlib
 
 try:
     # for pytest

rst_include/libs/lib_main.py

@@ -1,7 +1,10 @@
 # STDLIB
-import pathlib3x as pathlib
 from typing import IO, Union
 
+# OWN
+import pathlib3x as pathlib
+
+# PROJ
 try:
     from . import lib_classes
     from . import lib_assemble_block

rst_include/libs/lib_source_line.py

@@ -1,6 +1,10 @@
-import pathlib3x as pathlib
+# STDLIB
 from typing import List, Union, IO
 
+# OWN
+import pathlib3x as pathlib
+
+# PROJ
 try:
     # for pytest
     from . import lib_classes

rst_include/libs/lib_str.py

@@ -1,5 +1,5 @@
 # OWN
-import lib_list     # type: ignore
+import lib_list
 
 
 def strip_multiline_string(str_multiline: str) -> str:

rst_include/libs/lib_test.py

@@ -1,6 +1,9 @@
 # STDLIB
+
+# OWN
 import pathlib3x as pathlib
 
+# PROJ
 try:
     # for pytest
     from . import lib_assemble_block

rst_include/libs/lib_test_compare_results.py

@@ -1,9 +1,10 @@
 # STDLIB
-import pathlib3x as pathlib
 from typing import List, Tuple
 
 # OWN
-import lib_log_utils    # type: ignore
+import lib_log_utils
+import pathlib3x as pathlib
+
 
 # PROJECT
 try:

rst_include/rst_include.py

@@ -6,7 +6,7 @@
 from typing import Tuple, Union, IO
 
 # OWN
-import lib_log_utils                # type: ignore
+import lib_log_utils
 
 # PROJECT
 try:

setup.py

@@ -83,7 +83,7 @@ def get_line_data(line: str) -> str:
 
 setup_kwargs: Dict[str, Any] = dict()
 setup_kwargs['name'] = 'rst_include'
-setup_kwargs['version'] = '2.0.2'
+setup_kwargs['version'] = '2.0.3'
 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']}