Skip to content

Commit

Permalink
Merge pull request #5 from bitranox/development
Browse files Browse the repository at this point in the history
v1.2.4
  • Loading branch information
bitranox authored Jul 31, 2020
2 parents 1130734 + 4334ad4 commit 543f530
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .docs/README_template.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Version 1.2.3 as of 2020-07-29, see changelog_
Version v1.2.4 as of 2020-07-31, see changelog_

=======================================================

Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
# package name
- PACKAGE_NAME="lib_platform"
# the registered CLI Command
- CLI_COMMAND=lib_platform
- CLI_COMMAND="lib_platform"
# 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)
Expand Down Expand Up @@ -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"


Expand All @@ -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"


Expand All @@ -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"


Expand All @@ -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"


Expand Down
33 changes: 19 additions & 14 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,45 @@ Changelog
- new MINOR version for added functionality in a backwards compatible manner
- new PATCH version for backwards compatible bug fixes

1.2.3
-----

v1.2.4
--------
2020-07-31: fix travis build

v1.2.3
--------
2020-07-29: feature release
- use the new pizzacutter template
- use cli_exit_tools

1.2.2
-----
v1.2.2
--------
2020-07-16: feature release
- fix cli test
- enable traceback option on cli errors

1.2.1
-----
v1.2.1
--------
2020-07-14 : patch release
- make it compatible with latest lib_registry


1.2.0
-----
v1.2.0
--------
2020-07-07 : service release
- new click cli
- use PizzaCutter Template
- added jupyter notebook
- dropped python2.7 - python3.5 support

1.0.3
-----
v1.0.3
--------
2019-06-14: add is_user_admin (check for administration rights)

1.0.2
-----
v1.0.2
--------
2019-04-28: Documentation Update, minor Fixes in setup.py

1.0.0
-----
v1.0.0
--------
2019-03-28: Initial public release, PyPi Release
35 changes: 20 additions & 15 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Version 1.2.3 as of 2020-07-29, see changelog_
Version v1.2.4 as of 2020-07-31, see changelog_

=======================================================

Expand Down Expand Up @@ -270,41 +270,46 @@ Changelog
- new MINOR version for added functionality in a backwards compatible manner
- new PATCH version for backwards compatible bug fixes

1.2.3
-----

v1.2.4
--------
2020-07-31: fix travis build

v1.2.3
--------
2020-07-29: feature release
- use the new pizzacutter template
- use cli_exit_tools

1.2.2
-----
v1.2.2
--------
2020-07-16: feature release
- fix cli test
- enable traceback option on cli errors

1.2.1
-----
v1.2.1
--------
2020-07-14 : patch release
- make it compatible with latest lib_registry


1.2.0
-----
v1.2.0
--------
2020-07-07 : service release
- new click cli
- use PizzaCutter Template
- added jupyter notebook
- dropped python2.7 - python3.5 support

1.0.3
-----
v1.0.3
--------
2019-06-14: add is_user_admin (check for administration rights)

1.0.2
-----
v1.0.2
--------
2019-04-28: Documentation Update, minor Fixes in setup.py

1.0.0
-----
v1.0.0
--------
2019-03-28: Initial public release, PyPi Release

4 changes: 2 additions & 2 deletions lib_platform/__init__conf__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = 'lib_platform'
title = 'some platform related functions, which also work correctly on wine'
version = '1.2.3'
version = 'v1.2.4'
url = 'https://github.com/bitranox/lib_platform'
author = 'Robert Nowotny'
author_email = '[email protected]'
Expand All @@ -14,7 +14,7 @@ def print_info() -> None:
some platform related functions, which also work correctly on wine
Version : 1.2.3
Version : v1.2.4
Url : https://github.com/bitranox/lib_platform
Author : Robert Nowotny
Email : [email protected]""")
27 changes: 16 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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


Expand All @@ -83,7 +88,7 @@ def get_line_data(line: str) -> str:

setup_kwargs: Dict[str, Any] = dict()
setup_kwargs['name'] = 'lib_platform'
setup_kwargs['version'] = '1.2.3'
setup_kwargs['version'] = 'v1.2.4'
setup_kwargs['url'] = 'https://github.com/bitranox/lib_platform'
setup_kwargs['packages'] = find_packages()
setup_kwargs['package_data'] = {'lib_platform': ['py.typed', '*.pyi', '__init__.pyi']}
Expand Down

0 comments on commit 543f530

Please sign in to comment.