Merge pull request #6 from bitranox/development

v1.2.5
bitranox · Aug 1, 2020 · 91f7bdf · 91f7bdf
2 parents 543f530 + 51a14fc
commit 91f7bdf
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 40 deletions.
diff --git a/.docs/README_template.rst b/.docs/README_template.rst
@@ -1,10 +1,10 @@
-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
@@ -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 <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
diff --git 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="False"
+          - 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
@@ -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
@@ -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`_
+
 |travis_build| |license| |jupyter| |pypi|
 
 |codecov| |better_code| |cc_maintain| |cc_issues| |cc_coverage| |snyk|
@@ -53,7 +52,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 <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
 
@@ -270,6 +269,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
@@ -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 = '[email protected]'
@@ -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   : [email protected]""")
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -3,7 +3,7 @@
 ## "setup.py install test" or "pip install <package> --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
@@ -13,12 +13,8 @@
 
 
 def is_travis_deploy() -> bool:
-    if 'DEPLOY' not in os.environ:
-        return False
-    if os.environ['DEPLOY'].lower() == 'true' and is_tagged_commit():
-        return True
-    else:
-        return False
+    if os.getenv('DEPLOY_SDIST', '') or os.getenv('DEPLOY_WHEEL', ''):
+        return is_tagged_commit()
 
 
 def is_tagged_commit() -> bool:
@@ -88,7 +84,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']}
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
+    ---------
+-08-01: fix pypi deploy
     v1.2.4
     --------
@@ Expand Down @@