From 5d55c78b01447fb3fb9611eb6dc4ff12ac360bcb Mon Sep 17 00:00:00 2001 From: bitranox Date: Sat, 1 Aug 2020 16:00:30 +0200 Subject: [PATCH] refractor --- .docs/README_template.rst | 7 ++- .docs/tested_under.rst | 2 +- .travis.yml | 98 +++++++++++++++++++++++++++------- CHANGES.rst | 3 ++ README.rst | 11 ++-- lib_platform/__init__conf__.py | 4 +- requirements_test.txt | 2 +- setup.py | 2 +- 8 files changed, 95 insertions(+), 34 deletions(-) diff --git a/.docs/README_template.rst b/.docs/README_template.rst index 381f815..f3e0b34 100644 --- a/.docs/README_template.rst +++ b/.docs/README_template.rst @@ -1,10 +1,9 @@ -Version v1.2.4 as of 2020-07-31, see changelog_ - -======================================================= - lib_platform ============ +Version v1.2.5 as of 2020-08-01, see `Changelog`_. + + .. include:: ./badges.rst .. include:: ./description.rst diff --git a/.docs/tested_under.rst b/.docs/tested_under.rst index edc20e6..6fb0643 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 +tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64 `100% code coverage `_, codestyle checking ,mypy static type checking ,tested under `Linux, macOS, Windows `_, automatic daily builds and monitoring diff --git a/.travis.yml b/.travis.yml index ebccdae..6f8ebab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,11 +37,11 @@ addons: services: # start services - xvfb # is needed for WINE on headless installation - matrix: include: - os: windows + if: true language: sh name: "Windows Python 3.8" @@ -55,59 +55,111 @@ matrix: - 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 BUILD_DOCS="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: linux + arch: "amd64" + if: true language: python python: "3.6" before_install: - - export MYPY_STRICT="True" - export BUILD_DOCS="False" - - export DEPLOY_CHECK="True" - - export DEPLOY="False" - + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: linux + arch: "amd64" + if: true language: python python: "3.7" before_install: - - export MYPY_STRICT="True" - export BUILD_DOCS="False" - - export DEPLOY_CHECK="True" - - export DEPLOY="False" - + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: linux + arch: "amd64" + if: true language: python python: "3.8" before_install: - - export MYPY_STRICT="True" - export BUILD_DOCS="True" - - export DEPLOY_CHECK="True" - - export DEPLOY="True" - + - export DEPLOY_SDIST="True" + - export DEPLOY_WHEEL="True" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: linux + arch: "amd64" + if: true language: python python: "3.8-dev" before_install: - - export MYPY_STRICT="True" - export BUILD_DOCS="False" - - export DEPLOY_CHECK="True" - - export DEPLOY="False" - + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: linux + arch: "amd64" + if: true language: python python: "pypy3" before_install: - - export MYPY_STRICT="False" - export BUILD_DOCS="False" - - export DEPLOY_CHECK="True" - - export DEPLOY="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="False" + + - os: linux + arch: "ppc64le" + if: tag IS present + language: python + python: "3.8" + before_install: + - export BUILD_DOCS="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="True" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" + - os: linux + arch: "s390x" + if: tag IS present + language: python + python: "3.8" + before_install: + - export BUILD_DOCS="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="True" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" + + - os: linux + arch: "arm64" + if: tag IS present + language: python + python: "3.8" + before_install: + - export BUILD_DOCS="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="True" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" - os: osx + if: true language: sh name: "macOS 10.15.4" python: "3.8" @@ -117,6 +169,11 @@ matrix: - cPREFIX="" # prefix before commands - used for wine, there the prefix is "wine" - cPYTHON="python3" # command to launch python interpreter (its different on macOs, there we need python3) - cPIP="python3 -m pip" # command to launch pip (its different on macOs, there we need pip3) + - export BUILD_DOCS="False" + - export DEPLOY_SDIST="False" + - export DEPLOY_WHEEL="False" + - export DEPLOY_TEST="True" + - export MYPY_STRICT="True" install: @@ -132,6 +189,7 @@ script: after_success: - lib_travis after_success - lib_travis deploy + - ls -l ./dist notifications: email: diff --git a/CHANGES.rst b/CHANGES.rst index 8c36b30..3af442d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog - new MINOR version for added functionality in a backwards compatible manner - new PATCH version for backwards compatible bug fixes +v1.2.5 +--------- +2020-08-01: fix pypi deploy v1.2.4 -------- diff --git a/README.rst b/README.rst index d51bf5b..93f19e1 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,8 @@ -Version v1.2.4 as of 2020-07-31, see changelog_ - -======================================================= - lib_platform ============ +Version v1.2.5 as of 2020-08-01, see `Changelog`_. + |travis_build| |license| |jupyter| |pypi| |codecov| |better_code| |cc_maintain| |cc_issues| |cc_coverage| |snyk| @@ -53,7 +51,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 +tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64 `100% code coverage `_, codestyle checking ,mypy static type checking ,tested under `Linux, macOS, Windows `_, automatic daily builds and monitoring @@ -270,6 +268,9 @@ Changelog - new MINOR version for added functionality in a backwards compatible manner - new PATCH version for backwards compatible bug fixes +v1.2.5 +--------- +2020-08-01: fix pypi deploy v1.2.4 -------- diff --git a/lib_platform/__init__conf__.py b/lib_platform/__init__conf__.py index 8895a42..9278482 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.4' +version = 'v1.2.5' 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.4 + Version : v1.2.5 Url : https://github.com/bitranox/lib_platform Author : Robert Nowotny Email : bitranox@gmail.com""") diff --git a/requirements_test.txt b/requirements_test.txt index 88be256..c56d260 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -3,7 +3,7 @@ ## "setup.py install test" or "pip install --install-option test" coloredlogs mypy ; platform_python_implementation != "PyPy" -pytest +pytest==5.4 pytest-pycodestyle ; python_version >= "3.5" pytest-mypy ; platform_python_implementation != "PyPy" and python_version >= "3.5" pytest-runner diff --git a/setup.py b/setup.py index ffff74c..d38f291 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ def get_line_data(line: str) -> str: setup_kwargs: Dict[str, Any] = dict() setup_kwargs['name'] = 'lib_platform' -setup_kwargs['version'] = 'v1.2.4' +setup_kwargs['version'] = 'v1.2.5' 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']}