Skip to content

Commit

Permalink
Merge pull request #8 from bitranox/development
Browse files Browse the repository at this point in the history
v1.2.7
  • Loading branch information
bitranox authored Oct 9, 2020
2 parents 59784db + 01c98ce commit fa1344d
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .docs/README_template.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lib_platform
============


Version v1.2.6 as of 2020-08-08 see `Changelog`_
Version v1.2.7 as of 2020-10-09 see `Changelog`_


.. include:: ./badges.rst
Expand Down
5 changes: 4 additions & 1 deletion .docs/badges.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
|travis_build| |license| |jupyter| |pypi|
|travis_build| |license| |jupyter| |pypi|

|codecov| |better_code| |cc_maintain| |cc_issues| |cc_coverage| |snyk|

Expand Down Expand Up @@ -36,3 +36,6 @@

.. |snyk| image:: https://img.shields.io/snyk/vulnerabilities/github/bitranox/lib_platform
:target: https://snyk.io/test/github/bitranox/lib_platform

.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/psf/black
2 changes: 1 addition & 1 deletion .docs/tested_under.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64
tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.9-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64

`100% code coverage <https://codecov.io/gh/bitranox/lib_platform>`_, flake8 style checking ,mypy static type checking ,tested under `Linux, macOS, Windows <https://travis-ci.org/bitranox/lib_platform>`_, automatic daily builds and monitoring
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ matrix:
- os: windows
if: true
language: sh
name: "Windows Python 3.8"
name: "Windows Python 3.9"

# oddly a secure password under env: global: causes that choco fails
# so we need to put the option : filter_secrets: false
Expand All @@ -71,7 +71,7 @@ matrix:
- chmod -R 0755 /usr/local/lib_bash
- chmod -R +x /usr/local/lib_bash/*.sh
- /usr/local/lib_bash/lib_retry.sh retry choco install python3
- export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
- export PATH="/c/Python310:/c/Python310/Scripts:/c/Python39:/c/Python39/Scripts:/c/Python38:/c/Python38/Scripts:$PATH"
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
Expand Down Expand Up @@ -119,7 +119,7 @@ matrix:
arch: "amd64"
if: true
language: python
python: "3.8-dev"
python: "3.9-dev"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="True"
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ Changelog
- new MINOR version for added functionality in a backwards compatible manner
- new PATCH version for backwards compatible bug fixes

v1.2.7
--------
2020-10-09: service release
- update travis build matrix for linux 3.9-dev
- update travis build matrix (paths) for windows 3.9 / 3.10

v1.2.6
--------
2020-08-08: service release
Expand Down
13 changes: 11 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lib_platform
============


Version v1.2.6 as of 2020-08-08 see `Changelog`_
Version v1.2.7 as of 2020-10-09 see `Changelog`_

|travis_build| |license| |jupyter| |pypi|

Expand Down Expand Up @@ -43,6 +43,9 @@ Version v1.2.6 as of 2020-08-08 see `Changelog`_
.. |snyk| image:: https://img.shields.io/snyk/vulnerabilities/github/bitranox/lib_platform
:target: https://snyk.io/test/github/bitranox/lib_platform

.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/psf/black

some platform related functions, which also work correctly on wine

----
Expand All @@ -52,7 +55,7 @@ automated tests, Travis Matrix, Documentation, Badges, etc. are managed with `Pi

Python version required: 3.6.0 or newer

tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64
tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.9-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64

`100% code coverage <https://codecov.io/gh/bitranox/lib_platform>`_, flake8 style checking ,mypy static type checking ,tested under `Linux, macOS, Windows <https://travis-ci.org/bitranox/lib_platform>`_, automatic daily builds and monitoring

Expand Down Expand Up @@ -251,6 +254,12 @@ Changelog
- new MINOR version for added functionality in a backwards compatible manner
- new PATCH version for backwards compatible bug fixes

v1.2.7
--------
2020-10-09: service release
- update travis build matrix for linux 3.9-dev
- update travis build matrix (paths) for windows 3.9 / 3.10

v1.2.6
--------
2020-08-08: service release
Expand Down
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 = 'v1.2.6'
version = 'v1.2.7'
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 : v1.2.6
Version : v1.2.7
Url : https://github.com/bitranox/lib_platform
Author : Robert Nowotny
Email : [email protected]""")
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_line_data(line: str) -> str:

setup_kwargs: Dict[str, Any] = dict()
setup_kwargs["name"] = "lib_platform"
setup_kwargs["version"] = "v1.2.6"
setup_kwargs["version"] = "v1.2.7"
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
12 changes: 12 additions & 0 deletions tests/local_testscripts/lib_bash_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ function cleanup() {
}


function run_black() {
# run black for *.py files
my_banner "running black with settings from ${project_root_dir}/pyproject.toml"
if ! python3 -m black "${project_root_dir}"/**/*.py; then
my_banner_warning "black ERROR"
beep
sleep "${sleeptime_on_error}"
return 1
fi
}


function run_flake8_tests() {
# run flake8, settings from setup.cfg
my_banner "running flake8 with settings from ${project_root_dir}/setup.cfg"
Expand Down
5 changes: 5 additions & 0 deletions tests/local_testscripts/run_testloop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ project_root_dir="${project_root_dir}"
DO_FLAKE8_TESTS="True"
DO_MYPY_TESTS="True"
DO_PYTEST="True"
DO_BLACK="False"
# cleanup on cntrl-c
trap cleanup EXIT

Expand All @@ -24,6 +25,10 @@ function pytest_loop {
banner "Project Root Dir: ${project_root_dir}"
cleanup

if [ "${DO_BLACK}" == "True" ]; then
if ! run_black; then continue; fi
fi

# we prefer to run tests on its own, not within pytest, due to shaky and outdated pytest plugins
if [ "${DO_FLAKE8_TESTS}" == "True" ]; then
if ! run_flake8_tests; then continue; fi
Expand Down

0 comments on commit fa1344d

Please sign in to comment.