Merge pull request #6 from bitranox/development

bitranox · web-flow · commit 6fbb1a775bbc · 2020-07-31T08:04:16.000+02:00
v1.3.6
diff --git a/.docs/README_template.rst b/.docs/README_template.rst
@@ -1,4 +1,4 @@
-Version 0.3.5 as of 2020-07-29, see changelog_
+Version v1.3.6 as of 2020-07-31, see changelog_
 
 =======================================================
 
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ env:
         # package name
         - PACKAGE_NAME="pathlib3x"
         # the registered CLI Command
-        - CLI_COMMAND=pathlib3x
+        - CLI_COMMAND="pathlib3x"
         # the source file for rst_include (rebuild rst file includes)
         - RST_INCLUDE_SOURCE="./.docs/README_template.rst"
         # the target file for rst_include (rebuild rst file includes)
@@ -63,7 +63,7 @@ matrix:
       before_install:
           - export MYPY_STRICT="True"
           - export BUILD_DOCS="False"
-          - export DEPLOY_CHECK="False"
+          - export DEPLOY_CHECK="True"
           - export DEPLOY="False"
 
 
@@ -73,7 +73,7 @@ matrix:
       before_install:
           - export MYPY_STRICT="True"
           - export BUILD_DOCS="False"
-          - export DEPLOY_CHECK="False"
+          - export DEPLOY_CHECK="True"
           - export DEPLOY="False"
 
 
@@ -93,7 +93,7 @@ matrix:
       before_install:
           - export MYPY_STRICT="True"
           - export BUILD_DOCS="False"
-          - export DEPLOY_CHECK="False"
+          - export DEPLOY_CHECK="True"
           - export DEPLOY="False"
 
 
@@ -103,7 +103,7 @@ matrix:
       before_install:
           - export MYPY_STRICT="False"
           - export BUILD_DOCS="False"
-          - export DEPLOY_CHECK="False"
+          - export DEPLOY_CHECK="True"
           - export DEPLOY="False"
 
 
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,35 +5,39 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
-0.3.5
------
+v1.3.6
+--------
+2020-07-31: fix travis build
+
+v0.3.5
+--------
 2020-07-29: feature release
     - use the new pizzacutter template
     - use cli_exit_tools
 
-0.3.4
------
+v0.3.4
+--------
 2020-07-15 : patch release
     - fix cli test
     - enable traceback option on cli errors
 
-0.3.3
------
+v0.3.3
+--------
 2020-07-15 : patch release
     - fix minor typos
 
-0.3.2
------
+v0.3.2
+--------
 2020-07-05 : patch release
     - fix typo in setup.py setup parameter zip_safe
 
-0.3.1
------
+v0.3.1
+--------
 2020-07-05 : patch release
     - fix version issues in the stub files
 
-0.3.0
------
+v0.3.0
+--------
 2020-07-05 : added functions, include stub files for typing, setup python_requires
     - added python_requires in setup.py
     - include type stub files, its fully type hinted package now (PEP 561)
@@ -48,18 +52,18 @@ Changelog
     - added Path.copytree
     - added Path.rmtree
 
-0.2.0
------
+v0.2.0
+--------
 2020-07-02 : added function: PurePath.append_suffix(suffix)
     - added function: PurePath.append_suffix(suffix)
 
-0.1.1
------
+v0.1.1
+--------
 2020-07-01: patch release
     - guarded the sys.audit calls with try-except clauses, because sys.event is only avail in python 3.8
 
 
-0.1.0
+v0.1.0
 -----
 2020-06-29: initial release
     - initial release
diff --git a/README.rst b/README.rst
@@ -1,4 +1,4 @@
-Version 0.3.5 as of 2020-07-29, see changelog_
+Version v1.3.6 as of 2020-07-31, see changelog_
 
 =======================================================
 
@@ -480,35 +480,39 @@ Changelog
 - new MINOR version for added functionality in a backwards compatible manner
 - new PATCH version for backwards compatible bug fixes
 
-0.3.5
------
+v1.3.6
+--------
+2020-07-31: fix travis build
+
+v0.3.5
+--------
 2020-07-29: feature release
     - use the new pizzacutter template
     - use cli_exit_tools
 
-0.3.4
------
+v0.3.4
+--------
 2020-07-15 : patch release
     - fix cli test
     - enable traceback option on cli errors
 
-0.3.3
------
+v0.3.3
+--------
 2020-07-15 : patch release
     - fix minor typos
 
-0.3.2
------
+v0.3.2
+--------
 2020-07-05 : patch release
     - fix typo in setup.py setup parameter zip_safe
 
-0.3.1
------
+v0.3.1
+--------
 2020-07-05 : patch release
     - fix version issues in the stub files
 
-0.3.0
------
+v0.3.0
+--------
 2020-07-05 : added functions, include stub files for typing, setup python_requires
     - added python_requires in setup.py
     - include type stub files, its fully type hinted package now (PEP 561)
@@ -523,18 +527,18 @@ Changelog
     - added Path.copytree
     - added Path.rmtree
 
-0.2.0
------
+v0.2.0
+--------
 2020-07-02 : added function: PurePath.append_suffix(suffix)
     - added function: PurePath.append_suffix(suffix)
 
-0.1.1
------
+v0.1.1
+--------
 2020-07-01: patch release
     - guarded the sys.audit calls with try-except clauses, because sys.event is only avail in python 3.8
 
 
-0.1.0
+v0.1.0
 -----
 2020-06-29: initial release
     - initial release
diff --git a/pathlib3x/__init__conf__.py b/pathlib3x/__init__conf__.py
@@ -1,6 +1,6 @@
 name = 'pathlib3x'
 title = 'backport of pathlib 3.10 to python 3.6, 3.7, 3.8, 3.9 with a few extensions'
-version = '0.3.5'
+version = 'v1.3.6'
 url = 'https://github.com/bitranox/pathlib3x'
 author = 'Robert Nowotny'
 author_email = 'bitranox@gmail.com'
@@ -14,7 +14,7 @@ def print_info() -> None:
 
     backport of pathlib 3.10 to python 3.6, 3.7, 3.8, 3.9 with a few extensions
 
-    Version : 0.3.5
+    Version : v1.3.6
     Url     : https://github.com/bitranox/pathlib3x
     Author  : Robert Nowotny
     Email   : bitranox@gmail.com""")
diff --git a/setup.py b/setup.py
@@ -13,15 +13,17 @@
 
 
 def is_travis_deploy() -> bool:
-    if 'travis_deploy' in os.environ:
-        if os.environ['travis_deploy'] == 'True':
-            return True
-    return False
+    if 'DEPLOY' not in os.environ:
+        return False
+    if os.environ['DEPLOY'].lower() == 'true' and is_tagged_commit():
+        return True
+    else:
+        return False
 
 
 def is_tagged_commit() -> bool:
     if 'TRAVIS_TAG' in os.environ:
-        if os.environ['TRAVIS_TAG'] != '':
+        if os.environ['TRAVIS_TAG']:
             return True
     return False
 
@@ -56,11 +58,14 @@ def get_requirements_from_file(requirements_filename: str) -> List[str]:
     >>> assert len(get_requirements_from_file('requirements.txt')) > 0
     """
     l_requirements = list()
-    with open(str(pathlib.Path(__file__).parent / requirements_filename), mode='r') as requirements_file:
-        for line in requirements_file:
-            line_data = get_line_data(line)
-            if line_data:
-                l_requirements.append(line_data)
+    try:
+        with open(str(pathlib.Path(__file__).parent / requirements_filename), mode='r') as requirements_file:
+            for line in requirements_file:
+                line_data = get_line_data(line)
+                if line_data:
+                    l_requirements.append(line_data)
+    except FileNotFoundError:
+        pass
     return l_requirements
 
 
@@ -83,7 +88,7 @@ def get_line_data(line: str) -> str:
 
 setup_kwargs: Dict[str, Any] = dict()
 setup_kwargs['name'] = 'pathlib3x'
-setup_kwargs['version'] = '0.3.5'
+setup_kwargs['version'] = 'v1.3.6'
 setup_kwargs['url'] = 'https://github.com/bitranox/pathlib3x'
 setup_kwargs['packages'] = find_packages()
 setup_kwargs['package_data'] = {'pathlib3x': ['py.typed', '*.pyi', '__init__.pyi']}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Version 0.3.5 as of 2020-07-29, see changelog_`
	`1`	`+Version v1.3.6 as of 2020-07-31, see changelog_`
`2`	`2`
`3`	`3`	`=======================================================`
`4`	`4`