diff --git a/.docs/README_template.rst b/.docs/README_template.rst index 8c5edfd..7840de8 100644 --- a/.docs/README_template.rst +++ b/.docs/README_template.rst @@ -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 diff --git a/.docs/badges.rst b/.docs/badges.rst index 6d306d0..e874d59 100644 --- a/.docs/badges.rst +++ b/.docs/badges.rst @@ -1,4 +1,4 @@ -|travis_build| |license| |jupyter| |pypi| +|travis_build| |license| |jupyter| |pypi| |codecov| |better_code| |cc_maintain| |cc_issues| |cc_coverage| |snyk| @@ -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 diff --git a/.docs/tested_under.rst b/.docs/tested_under.rst index bc6d845..28f7141 100644 --- a/.docs/tested_under.rst +++ b/.docs/tested_under.rst @@ -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 `_, flake8 style checking ,mypy static type checking ,tested under `Linux, macOS, Windows `_, automatic daily builds and monitoring diff --git a/.travis.yml b/.travis.yml index e539ea8..edd1599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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" @@ -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" diff --git a/CHANGES.rst b/CHANGES.rst index 58889a3..1b1541d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 diff --git a/README.rst b/README.rst index bf00c7d..b9be23d 100644 --- a/README.rst +++ b/README.rst @@ -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| @@ -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 ---- @@ -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 `_, flake8 style checking ,mypy static type checking ,tested under `Linux, macOS, Windows `_, automatic daily builds and monitoring @@ -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 diff --git a/lib_platform/__init__conf__.py b/lib_platform/__init__conf__.py index c316c73..0544205 100644 --- a/lib_platform/__init__conf__.py +++ b/lib_platform/__init__conf__.py @@ -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 = 'bitranox@gmail.com' @@ -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 : bitranox@gmail.com""") diff --git a/setup.py b/setup.py index b7e4215..d64f782 100644 --- a/setup.py +++ b/setup.py @@ -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"]} diff --git a/tests/local_testscripts/lib_bash_functions.sh b/tests/local_testscripts/lib_bash_functions.sh index aeb35b8..f7d45d6 100644 --- a/tests/local_testscripts/lib_bash_functions.sh +++ b/tests/local_testscripts/lib_bash_functions.sh @@ -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" diff --git a/tests/local_testscripts/run_testloop.sh b/tests/local_testscripts/run_testloop.sh index 222d298..2eb5b6a 100644 --- a/tests/local_testscripts/run_testloop.sh +++ b/tests/local_testscripts/run_testloop.sh @@ -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 @@ -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