Skip to content

Commit

Permalink
Merge pull request #7 from bitranox/development
Browse files Browse the repository at this point in the history
v1.2.6
  • Loading branch information
bitranox authored Aug 8, 2020
2 parents 91f7bdf + 6046bca commit 59784db
Show file tree
Hide file tree
Showing 20 changed files with 210 additions and 187 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.5 as of 2020-08-01 see `Changelog`_
Version v1.2.6 as of 2020-08-08 see `Changelog`_


.. include:: ./badges.rst
Expand Down
17 changes: 2 additions & 15 deletions .docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,17 @@
python -m pip --upgrade pip
python -m pip --upgrade setuptools
python -m pip --upgrade wheel
.. include:: ./installation_via_pypi.rst

- to install the latest development version from github via pip:
- to install the latest version from github via pip:


.. code-block:: bash
# normal install
python -m pip install --upgrade git+https://github.com/bitranox/lib_platform.git
# to test without installing (can be skipped)
python -m pip install git+https://github.com/bitranox/lib_platform.git --install-option test
# to install and upgrade all dependencies regardless of version number
python -m pip install --upgrade git+https://github.com/bitranox/lib_platform.git --upgrade-strategy eager
- include it into Your requirements.txt:

Expand All @@ -39,19 +32,13 @@
python -m pip install --upgrade -r /<path>/requirements.txt
- to install the latest development version from source code:

.. code-block:: bash
# cd ~
$ git clone https://github.com/bitranox/lib_platform.git
$ cd lib_platform
# to test without installing (can be skipped)
python setup.py test
# normal install
python setup.py install
Expand Down
4 changes: 0 additions & 4 deletions .docs/installation_via_pypi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@

.. code-block:: bash
# install latest release from PyPi
python -m pip install --upgrade lib_platform
# test latest release from PyPi without installing (can be skipped)
python -m pip install lib_platform --install-option test
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

`100% code coverage <https://codecov.io/gh/bitranox/lib_platform>`_, codestyle checking ,mypy static type checking ,tested under `Linux, macOS, Windows <https://travis-ci.org/bitranox/lib_platform>`_, automatic daily builds and monitoring
`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
75 changes: 46 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,23 @@ env:
- cPIP="python -m pip"
# switch off wine fix me messages
- WINEDEBUG=fixme-all
# mypy path

# PYTEST
- PYTEST_DO_TESTS="True"

# FLAKE8 tests
- DO_FLAKE8_TESTS="True"

# MYPY tests
- MYPY_DO_TESTS="True"
- MYPY_OPTIONS="--follow-imports=normal --implicit-reexport --no-warn-unused-ignores --strict"
- MYPYPATH="./lib_platform/3rd_party_stubs"

# coverage
- DO_COVERAGE="True"
- DO_COVERAGE_UPLOAD_CODECOV="True"
- DO_COVERAGE_UPLOAD_CODE_CLIMATE="True"

# package name
- PACKAGE_NAME="lib_platform"
# the registered CLI Command
Expand All @@ -23,11 +38,13 @@ env:
- RST_INCLUDE_SOURCE="./.docs/README_template.rst"
# the target file for rst_include (rebuild rst file includes)
- RST_INCLUDE_TARGET="./README.rst"

# secure environment variable
- secure: "IDAldo6HWLAFHnQg4SRyMO4og923nEjeQ/jeOeFUhvgb8/p8Sq01NZR+CH6EC/YRucTjbuBwociJXgQ88hkYprczbWGiijU0MgV/iiRPHd0/f8ZLOTXsOKK81pKV1wcrZMOsqRwwXCjRZHRr2dwK7kJKlV/5p/ESFI9ZscMZrOllS/vEwoPkyWo8rkMjV/oVvC9N8LENvCDjVseODYBXKMpN9TmrICIghiqnndNU0zdOUmNUqquQajxWRiCfowktkmPBkZpJvCDRm6TEgckVHdnczZE4Hzm8SIqEnQK/FAvy+9N65dbH7yiKufTBBdsQrwtwH1+CAAlIbeWnGtezOSON9zRkJYAjeeE1/ax28coh0NiIg0hNCzSawEjp0mVJnvwYDpW06szvBURaOYtCz9FZ8//Ql5xIKCM9IxX3FMiwhoEKHsmbkYEc5KmljkBBNaKOoxI8rFN26XvqoI9y2aRR7I/fFWxfFiIgVsRo1CL1qFhl+R0dnHbNK0abcGLQ6mRmvqXvQb3tW67So13NBueLfBibARR6uE7lh27JG0rLa92Xez2TPBr0mUOS4QDyrNNXv94LHUzO6rrSO3ZCXqXadqX340EcB9J8TG7a6jLp6R03uLCeGCda7ZWpF/9jbD4iAsDExCb+twwfaN0FCKxYn0VTDFLcJRHv2l4wIGM=" # CC_TEST_REPORTER_ID.secret
- secure: "wK8WmNhbVEkbI8V3vSGKFtme/75tL/DItotP66lUleD0sgQyNs3EM+USZPtkFkpJYnIyaX+qfH1zMR+nwLcOmbWHFAcyRBJXmDDDU3E3+UGEJ8DcLEktYOvnY5fGPdbjN5OMDbNdDYwwkC1Ggq/Cqbt1IwYNBCiuzxVtKIPo7oPFShg1mzkvmRTWD4MGygOUYlNTx9/x8OrnXrbj15tGRbrgjF3QE1HC87E464DUN77RZkNmV4ObW/sjo0LqubYeo5Je32oYk7Ys1akFQnPNxYgk+sFA2EvlvLdqDwK/GrV8KTB2OmhA0pgEFR505pCvHiPIA6WbShj2fffqNXUfFHHULo/sgHxI59Fk+lM5jjBQ+OiQuS41BoNhs02pLeuHsNBwRcqFu9MTrDKOtyIuMfbjG4MUTf6x6yleDRkGIkxZLQ0X6QDLOikEb0bVVxZ/xC3lrNfpgz6kRlXfopsBZK1AVrA3HnvhAeI+WjgsYxnHnLLuFddmKn6JpUaYn6GsS+k8gml0t82hi5d77dzVjycgdihk0nEwxbXLpSNuOSEIQu+TXnQZwpV8GOsnpHNYdvfAZIyQ7NZNQqO3O1hrA3qy3bbK87ZgwtkOg4/iZdVjBzEDHF6x2Hw/275WY/b9E3VL1yW+p5w1txG3tPb+wy7kVHmuW3SdmbP12y+a8aE=" # PYPI_PASSWORD.secret



addons:
apt:
packages:
Expand Down Expand Up @@ -59,7 +76,7 @@ matrix:
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="False"
- export MYPY_STRICT="True"
- export MYPY_DO_TESTS="True"


- os: linux
Expand All @@ -69,10 +86,10 @@ matrix:
python: "3.6"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "amd64"
Expand All @@ -81,10 +98,10 @@ matrix:
python: "3.7"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "amd64"
Expand All @@ -95,8 +112,8 @@ matrix:
- export BUILD_DOCS="True"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "amd64"
Expand All @@ -105,10 +122,10 @@ matrix:
python: "3.8-dev"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "amd64"
Expand All @@ -117,10 +134,10 @@ matrix:
python: "pypy3"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="False"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="False"

- os: linux
arch: "ppc64le"
Expand All @@ -129,10 +146,10 @@ matrix:
python: "3.8"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "s390x"
Expand All @@ -141,10 +158,10 @@ matrix:
python: "3.8"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: linux
arch: "arm64"
Expand All @@ -153,10 +170,10 @@ matrix:
python: "3.8"
before_install:
- export BUILD_DOCS="False"
- export DEPLOY_SDIST="False"
- export DEPLOY_SDIST="True"
- export DEPLOY_WHEEL="True"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export BUILD_TEST="True"
- export MYPY_DO_TESTS="True"

- os: osx
if: true
Expand All @@ -173,7 +190,7 @@ matrix:
- export DEPLOY_SDIST="False"
- export DEPLOY_WHEEL="False"
- export DEPLOY_TEST="True"
- export MYPY_STRICT="True"
- export MYPY_DO_TESTS="True"


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

v1.2.6
--------
2020-08-08: service release
- fix documentation
- fix travis
- deprecate pycodestyle
- implement flake8

v1.2.5
---------
2020-08-01: fix pypi deploy
Expand Down
32 changes: 11 additions & 21 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lib_platform
============


Version v1.2.5 as of 2020-08-01 see `Changelog`_
Version v1.2.6 as of 2020-08-08 see `Changelog`_

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

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

`100% code coverage <https://codecov.io/gh/bitranox/lib_platform>`_, codestyle checking ,mypy static type checking ,tested under `Linux, macOS, Windows <https://travis-ci.org/bitranox/lib_platform>`_, automatic daily builds and monitoring
`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 @@ -154,32 +154,20 @@ Installation and Upgrade
python -m pip --upgrade pip
python -m pip --upgrade setuptools
python -m pip --upgrade wheel
- to install the latest release from PyPi via pip (recommended):

.. code-block:: bash
# install latest release from PyPi
python -m pip install --upgrade lib_platform
# test latest release from PyPi without installing (can be skipped)
python -m pip install lib_platform --install-option test
- to install the latest development version from github via pip:
- to install the latest version from github via pip:


.. code-block:: bash
# normal install
python -m pip install --upgrade git+https://github.com/bitranox/lib_platform.git
# to test without installing (can be skipped)
python -m pip install git+https://github.com/bitranox/lib_platform.git --install-option test
# to install and upgrade all dependencies regardless of version number
python -m pip install --upgrade git+https://github.com/bitranox/lib_platform.git --upgrade-strategy eager
- include it into Your requirements.txt:

Expand All @@ -196,19 +184,13 @@ Installation and Upgrade
python -m pip install --upgrade -r /<path>/requirements.txt
- to install the latest development version from source code:

.. code-block:: bash
# cd ~
$ git clone https://github.com/bitranox/lib_platform.git
$ cd lib_platform
# to test without installing (can be skipped)
python setup.py test
# normal install
python setup.py install
- via makefile:
Expand Down Expand Up @@ -269,6 +251,14 @@ Changelog
- new MINOR version for added functionality in a backwards compatible manner
- new PATCH version for backwards compatible bug fixes

v1.2.6
--------
2020-08-08: service release
- fix documentation
- fix travis
- deprecate pycodestyle
- implement flake8

v1.2.5
---------
2020-08-01: fix pypi deploy
Expand Down
15 changes: 3 additions & 12 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import platform
from typing import List

collect_ignore = ['setup.py']
collect_ignore: List[str] = []


def pytest_cmdline_preparse(args: List[str]) -> None:
Expand All @@ -16,13 +15,5 @@ def pytest_cmdline_preparse(args: List[str]) -> None:
args[:] = ["-n", str(num)] + args
"""

additional_mypy_args: List[str] = list()
additional_pycodestyle_args: List[str] = list()

# add mypy option if not pypy
# if platform.python_implementation() != "PyPy" and sys.version_info >= (3, 5) and sys.version_info != (3, 6): # type: ignore
if platform.python_implementation() != "PyPy":
additional_mypy_args = ['--mypy']

additional_pycodestyle_args = ['--pycodestyle']
args[:] = list(set(args + additional_mypy_args + additional_pycodestyle_args))
additional_pytest_args: List[str] = []
args[:] = list(set(args + additional_pytest_args))
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.5'
version = 'v1.2.6'
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.5
Version : v1.2.6
Url : https://github.com/bitranox/lib_platform
Author : Robert Nowotny
Email : [email protected]""")
7 changes: 0 additions & 7 deletions mypy.ini

This file was deleted.

7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

[tool.black]
line-length = 88
target-version = ['py36']
# Note that you have to use single-quoted strings in TOML for regular expressions
include = '\.pyi?$'
exclude = '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist)/'
Loading

0 comments on commit 59784db

Please sign in to comment.