Skip to content

Commit 91f7bdf

Browse files
bitranoxbitranox
authored
Merge pull request #6 from bitranox/development
v1.2.5
2 parents 543f530 + 51a14fc commit 91f7bdf

File tree

8 files changed

+99
-40
lines changed

8 files changed

+99
-40
lines changed

‎.docs/README_template.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Version v1.2.4 as of 2020-07-31, see changelog_
2-
3-
=======================================================
4-
51
lib_platform
62
============
73

4+
5+
Version v1.2.5 as of 2020-08-01 see `Changelog`_
6+
7+
88
.. include:: ./badges.rst
99

1010
.. include:: ./description.rst

‎.docs/tested_under.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3
1+
tested on linux "bionic" with python 3.6, 3.7, 3.8, 3.8-dev, pypy3 - architectures: amd64, ppc64le, s390x, arm64
22

33
`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

‎.travis.yml‎

Lines changed: 78 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ addons:
3737
services: # start services
3838
- xvfb # is needed for WINE on headless installation
3939

40-
4140
matrix:
4241
include:
4342

4443
- os: windows
44+
if: true
4545
language: sh
4646
name: "Windows Python 3.8"
4747

@@ -55,59 +55,111 @@ matrix:
5555
- chmod -R +x /usr/local/lib_bash/*.sh
5656
- /usr/local/lib_bash/lib_retry.sh retry choco install python3
5757
- export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
58+
- export BUILD_DOCS="False"
59+
- export DEPLOY_SDIST="False"
60+
- export DEPLOY_WHEEL="False"
61+
- export DEPLOY_TEST="False"
62+
- export MYPY_STRICT="True"
5863

5964

6065
- os: linux
66+
arch: "amd64"
67+
if: true
6168
language: python
6269
python: "3.6"
6370
before_install:
64-
- export MYPY_STRICT="True"
6571
- export BUILD_DOCS="False"
66-
- export DEPLOY_CHECK="True"
67-
- export DEPLOY="False"
68-
72+
- export DEPLOY_SDIST="False"
73+
- export DEPLOY_WHEEL="False"
74+
- export DEPLOY_TEST="True"
75+
- export MYPY_STRICT="True"
6976

7077
- os: linux
78+
arch: "amd64"
79+
if: true
7180
language: python
7281
python: "3.7"
7382
before_install:
74-
- export MYPY_STRICT="True"
7583
- export BUILD_DOCS="False"
76-
- export DEPLOY_CHECK="True"
77-
- export DEPLOY="False"
78-
84+
- export DEPLOY_SDIST="False"
85+
- export DEPLOY_WHEEL="False"
86+
- export DEPLOY_TEST="True"
87+
- export MYPY_STRICT="True"
7988

8089
- os: linux
90+
arch: "amd64"
91+
if: true
8192
language: python
8293
python: "3.8"
8394
before_install:
84-
- export MYPY_STRICT="True"
8595
- export BUILD_DOCS="True"
86-
- export DEPLOY_CHECK="True"
87-
- export DEPLOY="True"
88-
96+
- export DEPLOY_SDIST="True"
97+
- export DEPLOY_WHEEL="True"
98+
- export DEPLOY_TEST="True"
99+
- export MYPY_STRICT="True"
89100

90101
- os: linux
102+
arch: "amd64"
103+
if: true
91104
language: python
92105
python: "3.8-dev"
93106
before_install:
94-
- export MYPY_STRICT="True"
95107
- export BUILD_DOCS="False"
96-
- export DEPLOY_CHECK="True"
97-
- export DEPLOY="False"
98-
108+
- export DEPLOY_SDIST="False"
109+
- export DEPLOY_WHEEL="False"
110+
- export DEPLOY_TEST="True"
111+
- export MYPY_STRICT="True"
99112

100113
- os: linux
114+
arch: "amd64"
115+
if: true
101116
language: python
102117
python: "pypy3"
103118
before_install:
104-
- export MYPY_STRICT="False"
105119
- export BUILD_DOCS="False"
106-
- export DEPLOY_CHECK="True"
107-
- export DEPLOY="False"
120+
- export DEPLOY_SDIST="False"
121+
- export DEPLOY_WHEEL="False"
122+
- export DEPLOY_TEST="True"
123+
- export MYPY_STRICT="False"
124+
125+
- os: linux
126+
arch: "ppc64le"
127+
if: tag IS present
128+
language: python
129+
python: "3.8"
130+
before_install:
131+
- export BUILD_DOCS="False"
132+
- export DEPLOY_SDIST="False"
133+
- export DEPLOY_WHEEL="True"
134+
- export DEPLOY_TEST="True"
135+
- export MYPY_STRICT="True"
108136

137+
- os: linux
138+
arch: "s390x"
139+
if: tag IS present
140+
language: python
141+
python: "3.8"
142+
before_install:
143+
- export BUILD_DOCS="False"
144+
- export DEPLOY_SDIST="False"
145+
- export DEPLOY_WHEEL="True"
146+
- export DEPLOY_TEST="True"
147+
- export MYPY_STRICT="True"
148+
149+
- os: linux
150+
arch: "arm64"
151+
if: tag IS present
152+
language: python
153+
python: "3.8"
154+
before_install:
155+
- export BUILD_DOCS="False"
156+
- export DEPLOY_SDIST="False"
157+
- export DEPLOY_WHEEL="True"
158+
- export DEPLOY_TEST="True"
159+
- export MYPY_STRICT="True"
109160

110161
- os: osx
162+
if: true
111163
language: sh
112164
name: "macOS 10.15.4"
113165
python: "3.8"
@@ -117,6 +169,11 @@ matrix:
117169
- cPREFIX="" # prefix before commands - used for wine, there the prefix is "wine"
118170
- cPYTHON="python3" # command to launch python interpreter (its different on macOs, there we need python3)
119171
- cPIP="python3 -m pip" # command to launch pip (its different on macOs, there we need pip3)
172+
- export BUILD_DOCS="False"
173+
- export DEPLOY_SDIST="False"
174+
- export DEPLOY_WHEEL="False"
175+
- export DEPLOY_TEST="True"
176+
- export MYPY_STRICT="True"
120177

121178

122179
install:
@@ -132,6 +189,7 @@ script:
132189
after_success:
133190
- lib_travis after_success
134191
- lib_travis deploy
192+
- ls -l ./dist
135193

136194
notifications:
137195
email:

‎CHANGES.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Changelog
55
- new MINOR version for added functionality in a backwards compatible manner
66
- new PATCH version for backwards compatible bug fixes
77

8+
v1.2.5
9+
---------
10+
2020-08-01: fix pypi deploy
811

912
v1.2.4
1013
--------

‎README.rst‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
Version v1.2.4 as of 2020-07-31, see changelog_
2-
3-
=======================================================
4-
51
lib_platform
62
============
73

4+
5+
Version v1.2.5 as of 2020-08-01 see `Changelog`_
6+
87
|travis_build| |license| |jupyter| |pypi|
98

109
|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
5352

5453
Python version required: 3.6.0 or newer
5554

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

5857
`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
5958

@@ -270,6 +269,9 @@ Changelog
270269
- new MINOR version for added functionality in a backwards compatible manner
271270
- new PATCH version for backwards compatible bug fixes
272271

272+
v1.2.5
273+
---------
274+
2020-08-01: fix pypi deploy
273275

274276
v1.2.4
275277
--------

‎lib_platform/__init__conf__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = 'lib_platform'
22
title = 'some platform related functions, which also work correctly on wine'
3-
version = 'v1.2.4'
3+
version = 'v1.2.5'
44
url = 'https://github.com/bitranox/lib_platform'
55
author = 'Robert Nowotny'
66
author_email = '[email protected]'
@@ -14,7 +14,7 @@ def print_info() -> None:
1414
1515
some platform related functions, which also work correctly on wine
1616
17-
Version : v1.2.4
17+
Version : v1.2.5
1818
Url : https://github.com/bitranox/lib_platform
1919
Author : Robert Nowotny
2020
Email : [email protected]""")

‎requirements_test.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## "setup.py install test" or "pip install <package> --install-option test"
44
coloredlogs
55
mypy ; platform_python_implementation != "PyPy"
6-
pytest
6+
pytest==5.4
77
pytest-pycodestyle ; python_version >= "3.5"
88
pytest-mypy ; platform_python_implementation != "PyPy" and python_version >= "3.5"
99
pytest-runner

‎setup.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313

1414

1515
def is_travis_deploy() -> bool:
16-
if 'DEPLOY' not in os.environ:
17-
return False
18-
if os.environ['DEPLOY'].lower() == 'true' and is_tagged_commit():
19-
return True
20-
else:
21-
return False
16+
if os.getenv('DEPLOY_SDIST', '') or os.getenv('DEPLOY_WHEEL', ''):
17+
return is_tagged_commit()
2218

2319

2420
def is_tagged_commit() -> bool:
@@ -88,7 +84,7 @@ def get_line_data(line: str) -> str:
8884

8985
setup_kwargs: Dict[str, Any] = dict()
9086
setup_kwargs['name'] = 'lib_platform'
91-
setup_kwargs['version'] = 'v1.2.4'
87+
setup_kwargs['version'] = 'v1.2.5'
9288
setup_kwargs['url'] = 'https://github.com/bitranox/lib_platform'
9389
setup_kwargs['packages'] = find_packages()
9490
setup_kwargs['package_data'] = {'lib_platform': ['py.typed', '*.pyi', '__init__.pyi']}

0 commit comments

Comments
 (0)