Skip to content

Commit 35f5ad6

Browse files
authored
Merge pull request #9 from bitranox/development
v1.3.8
2 parents 3885a40 + 3495808 commit 35f5ad6

17 files changed

+205
-181
lines changed

.docs/README_template.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pathlib3x
22
=========
33

44

5-
Version v1.3.7 as of 2020-08-01 see `Changelog`_
5+
Version v1.3.8 as of 2020-08-08 see `Changelog`_
66

77

88
.. include:: ./badges.rst

.docs/installation.rst

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@
55
66
python -m pip --upgrade pip
77
python -m pip --upgrade setuptools
8-
python -m pip --upgrade wheel
8+
99
1010
.. include:: ./installation_via_pypi.rst
1111

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

1414

1515
.. code-block:: bash
1616
17-
# normal install
1817
python -m pip install --upgrade git+https://github.com/bitranox/pathlib3x.git
1918
20-
# to test without installing (can be skipped)
21-
python -m pip install git+https://github.com/bitranox/pathlib3x.git --install-option test
22-
23-
# to install and upgrade all dependencies regardless of version number
24-
python -m pip install --upgrade git+https://github.com/bitranox/pathlib3x.git --upgrade-strategy eager
25-
2619
2720
- include it into Your requirements.txt:
2821

@@ -39,19 +32,13 @@
3932
python -m pip install --upgrade -r /<path>/requirements.txt
4033
4134
42-
4335
- to install the latest development version from source code:
4436

4537
.. code-block:: bash
4638
4739
# cd ~
4840
$ git clone https://github.com/bitranox/pathlib3x.git
4941
$ cd pathlib3x
50-
51-
# to test without installing (can be skipped)
52-
python setup.py test
53-
54-
# normal install
5542
python setup.py install
5643
5744

.docs/installation_via_pypi.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
22

33
.. code-block:: bash
44
5-
# install latest release from PyPi
65
python -m pip install --upgrade pathlib3x
7-
8-
# test latest release from PyPi without installing (can be skipped)
9-
python -m pip install pathlib3x --install-option test

.travis.yml

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,23 @@ env:
1313
- cPIP="python -m pip"
1414
# switch off wine fix me messages
1515
- WINEDEBUG=fixme-all
16-
# mypy path
16+
17+
# PYTEST
18+
- PYTEST_DO_TESTS="True"
19+
20+
# FLAKE8 tests
21+
- DO_FLAKE8_TESTS="False"
22+
23+
# MYPY tests
24+
- MYPY_DO_TESTS="True"
25+
- MYPY_OPTIONS="--follow-imports=normal --implicit-reexport --no-warn-unused-ignores --strict"
1726
- MYPYPATH="./pathlib3x/3rd_party_stubs"
27+
28+
# coverage
29+
- DO_COVERAGE="True"
30+
- DO_COVERAGE_UPLOAD_CODECOV="True"
31+
- DO_COVERAGE_UPLOAD_CODE_CLIMATE="True"
32+
1833
# package name
1934
- PACKAGE_NAME="pathlib3x"
2035
# the registered CLI Command
@@ -23,11 +38,13 @@ env:
2338
- RST_INCLUDE_SOURCE="./.docs/README_template.rst"
2439
# the target file for rst_include (rebuild rst file includes)
2540
- RST_INCLUDE_TARGET="./README.rst"
41+
2642
# secure environment variable
2743
- secure: "O+0o+rCBF9YSt6qCc5pobAEicFt3VonzG11/vx+98LIo75GoR+8f5kqWlZGc329cuHJgD2O3JDBnIFHuWzq3iCjACNjwSgFyYUZJLZbVVOsrNdDWaqPdQP6FNEF3Y5206/FtBeH1MOkwKu3K9YZIIGEOSMNqf4U/eKGHUETHZKXJX/95KfFnvRA4jFh9jj+Hc+Mg+51D4g1RRbJ18vW2whHd7p5lKYlChou/MTEKgmQfBHBrQ4CMdxh/VTKU95iUeKTRo3NwuzL9+wOOWtO6c+QwNPJgvL9+NZTroviYfzqVd7iuBvmj5Tg13tKVoV3bm4RgLy5cB2VHq2JAAeBWJEE7zLX1NFntSxJSG4CKZ8MVPxvaVxZXwa8svOqfRfxe8yOfUYnW3kNvppruXrRQ/3lmLulcWN6XkH55yS+5zWSk+EvxrXNq8YuD9ztTmi9b/Ur2PwTAMJG4IVL0XSzrEGrmu2Yz0OQa7gUYNiJfOhgAaI4Y6lv6Kq9PAn3uQiLat8vY8PD1FU9j0KKL9xr1a5RrZwc448an8/T3LXmS39STaBBUzO7Fc6IHhkNaybh5yYAJUtVZ5jUwRrsPcVdzWfiI/JzVjR+Qnx/8Q3p+A4u+s2H78pnHoPKlqPyHFJxQD+GNah5jRze+BVbn86q5+LY55H37+NkYpHyn6RYGrAk=" # CC_TEST_REPORTER_ID.secret
2844
- secure: "tQj4HojSPINDwP5EF8QKQKyewvJPYFmsfpzAsce0WY0Na9iZPqJaWEutDtenjJu/6ww4K1eocVLvAdsfNAoSXmxUrtbkYOw8f2URgb9EYmLFL46QiOs3WZ8hDmgr44qmvizSoto6abCerVlj2WtUmbCVc9nljZVPzUWy3LrkqzyZGyrZhqTxt/ObEI3FhEfrfhcN4UfexPjSnHSe1dqi53NrWQwFEltobyMWTznYIieJToCCNNPk/+3AjjPHkyHWU6vqLsakXoDVwsy028ScPjElu9Huw80wygpRq1i80RiT93GH5qYuV/VJBYT09BQNX4mBFTPauCykkcI1vE7I9BnbQMjrvCHDi1eH+u/yAFOCjKtMuuS5JNLzmKiS68SO1gA0Fv76Wi5vc+tsaz1YoXNnNvurWIEo5mz3sV+5cEV82jx7z70RjSMjOjwzz3gr/XMMDwvnvxP8FAsnolQ495VHGWBVo1pFnxcERT7mxi5TJcwvKtOHDypcFZP2/zt68upHB/Wnkl7aWk4O2ac0awSDQ01r4J0j72d6VkPv7GJvtl/SmMaPg4T+v6ID4BuYLf3BLWPgrQ9YQe94AKLUg8xWYxA5dCN6XoSAz5dZJLhNGHMkoaXmxhAw+ZxloIoUmRvE7yYWQYCGY+H4XpOFauZKr070cHy1HuB1Yv0fWSc=" # PYPI_PASSWORD.secret
2945

3046

47+
3148
addons:
3249
apt:
3350
packages:
@@ -59,7 +76,7 @@ matrix:
5976
- export DEPLOY_SDIST="False"
6077
- export DEPLOY_WHEEL="False"
6178
- export DEPLOY_TEST="False"
62-
- export MYPY_STRICT="True"
79+
- export MYPY_DO_TESTS="True"
6380

6481

6582
- os: linux
@@ -69,10 +86,10 @@ matrix:
6986
python: "3.6"
7087
before_install:
7188
- export BUILD_DOCS="False"
72-
- export DEPLOY_SDIST="False"
73-
- export DEPLOY_WHEEL="False"
74-
- export DEPLOY_TEST="True"
75-
- export MYPY_STRICT="True"
89+
- export DEPLOY_SDIST="True"
90+
- export DEPLOY_WHEEL="True"
91+
- export BUILD_TEST="True"
92+
- export MYPY_DO_TESTS="True"
7693

7794
- os: linux
7895
arch: "amd64"
@@ -81,10 +98,10 @@ matrix:
8198
python: "3.7"
8299
before_install:
83100
- export BUILD_DOCS="False"
84-
- export DEPLOY_SDIST="False"
101+
- export DEPLOY_SDIST="True"
85102
- export DEPLOY_WHEEL="False"
86-
- export DEPLOY_TEST="True"
87-
- export MYPY_STRICT="True"
103+
- export BUILD_TEST="True"
104+
- export MYPY_DO_TESTS="True"
88105

89106
- os: linux
90107
arch: "amd64"
@@ -95,8 +112,8 @@ matrix:
95112
- export BUILD_DOCS="True"
96113
- export DEPLOY_SDIST="True"
97114
- export DEPLOY_WHEEL="True"
98-
- export DEPLOY_TEST="True"
99-
- export MYPY_STRICT="True"
115+
- export BUILD_TEST="True"
116+
- export MYPY_DO_TESTS="True"
100117

101118
- os: linux
102119
arch: "amd64"
@@ -105,10 +122,10 @@ matrix:
105122
python: "3.8-dev"
106123
before_install:
107124
- export BUILD_DOCS="False"
108-
- export DEPLOY_SDIST="False"
109-
- export DEPLOY_WHEEL="False"
110-
- export DEPLOY_TEST="True"
111-
- export MYPY_STRICT="True"
125+
- export DEPLOY_SDIST="True"
126+
- export DEPLOY_WHEEL="True"
127+
- export BUILD_TEST="True"
128+
- export MYPY_DO_TESTS="True"
112129

113130
- os: linux
114131
arch: "amd64"
@@ -117,10 +134,10 @@ matrix:
117134
python: "pypy3"
118135
before_install:
119136
- export BUILD_DOCS="False"
120-
- export DEPLOY_SDIST="False"
121-
- export DEPLOY_WHEEL="False"
122-
- export DEPLOY_TEST="True"
123-
- export MYPY_STRICT="False"
137+
- export DEPLOY_SDIST="True"
138+
- export DEPLOY_WHEEL="True"
139+
- export BUILD_TEST="True"
140+
- export MYPY_DO_TESTS="False"
124141

125142
- os: linux
126143
arch: "ppc64le"
@@ -129,10 +146,10 @@ matrix:
129146
python: "3.8"
130147
before_install:
131148
- export BUILD_DOCS="False"
132-
- export DEPLOY_SDIST="False"
149+
- export DEPLOY_SDIST="True"
133150
- export DEPLOY_WHEEL="True"
134-
- export DEPLOY_TEST="True"
135-
- export MYPY_STRICT="True"
151+
- export BUILD_TEST="True"
152+
- export MYPY_DO_TESTS="True"
136153

137154
- os: linux
138155
arch: "s390x"
@@ -141,10 +158,10 @@ matrix:
141158
python: "3.8"
142159
before_install:
143160
- export BUILD_DOCS="False"
144-
- export DEPLOY_SDIST="False"
161+
- export DEPLOY_SDIST="True"
145162
- export DEPLOY_WHEEL="True"
146-
- export DEPLOY_TEST="True"
147-
- export MYPY_STRICT="True"
163+
- export BUILD_TEST="True"
164+
- export MYPY_DO_TESTS="True"
148165

149166
- os: linux
150167
arch: "arm64"
@@ -153,10 +170,10 @@ matrix:
153170
python: "3.8"
154171
before_install:
155172
- export BUILD_DOCS="False"
156-
- export DEPLOY_SDIST="False"
173+
- export DEPLOY_SDIST="True"
157174
- export DEPLOY_WHEEL="True"
158-
- export DEPLOY_TEST="True"
159-
- export MYPY_STRICT="True"
175+
- export BUILD_TEST="True"
176+
- export MYPY_DO_TESTS="True"
160177

161178
- os: osx
162179
if: true
@@ -173,7 +190,7 @@ matrix:
173190
- export DEPLOY_SDIST="False"
174191
- export DEPLOY_WHEEL="False"
175192
- export DEPLOY_TEST="True"
176-
- export MYPY_STRICT="True"
193+
- export MYPY_DO_TESTS="True"
177194

178195

179196
install:

CHANGES.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ 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.3.8
9+
--------
10+
2020-08-08: service release
11+
- fix documentation
12+
- fix travis
13+
- deprecate pycodestyle
14+
- implement flake8
15+
816
v1.3.7
917
---------
1018
2020-08-01: fix pypi deploy

README.rst

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pathlib3x
22
=========
33

44

5-
Version v1.3.7 as of 2020-08-01 see `Changelog`_
5+
Version v1.3.8 as of 2020-08-08 see `Changelog`_
66

77
|travis_build| |license| |pypi|
88

@@ -365,32 +365,20 @@ Installation and Upgrade
365365
366366
python -m pip --upgrade pip
367367
python -m pip --upgrade setuptools
368-
python -m pip --upgrade wheel
369368
370369
- to install the latest release from PyPi via pip (recommended):
371370

372371
.. code-block:: bash
373372
374-
# install latest release from PyPi
375373
python -m pip install --upgrade pathlib3x
376374
377-
# test latest release from PyPi without installing (can be skipped)
378-
python -m pip install pathlib3x --install-option test
379-
380-
- to install the latest development version from github via pip:
375+
- to install the latest version from github via pip:
381376

382377

383378
.. code-block:: bash
384379
385-
# normal install
386380
python -m pip install --upgrade git+https://github.com/bitranox/pathlib3x.git
387381
388-
# to test without installing (can be skipped)
389-
python -m pip install git+https://github.com/bitranox/pathlib3x.git --install-option test
390-
391-
# to install and upgrade all dependencies regardless of version number
392-
python -m pip install --upgrade git+https://github.com/bitranox/pathlib3x.git --upgrade-strategy eager
393-
394382
395383
- include it into Your requirements.txt:
396384

@@ -407,19 +395,13 @@ Installation and Upgrade
407395
python -m pip install --upgrade -r /<path>/requirements.txt
408396
409397
410-
411398
- to install the latest development version from source code:
412399

413400
.. code-block:: bash
414401
415402
# cd ~
416403
$ git clone https://github.com/bitranox/pathlib3x.git
417404
$ cd pathlib3x
418-
419-
# to test without installing (can be skipped)
420-
python setup.py test
421-
422-
# normal install
423405
python setup.py install
424406
425407
- via makefile:
@@ -479,6 +461,14 @@ Changelog
479461
- new MINOR version for added functionality in a backwards compatible manner
480462
- new PATCH version for backwards compatible bug fixes
481463

464+
v1.3.8
465+
--------
466+
2020-08-08: service release
467+
- fix documentation
468+
- fix travis
469+
- deprecate pycodestyle
470+
- implement flake8
471+
482472
v1.3.7
483473
---------
484474
2020-08-01: fix pypi deploy

conftest.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import platform
21
from typing import List
32

4-
collect_ignore = ['setup.py']
3+
collect_ignore: List[str] = []
54

65

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

19-
additional_mypy_args: List[str] = list()
20-
additional_pycodestyle_args: List[str] = list()
21-
22-
# add mypy option if not pypy
23-
# if platform.python_implementation() != "PyPy" and sys.version_info >= (3, 5) and sys.version_info != (3, 6): # type: ignore
24-
if platform.python_implementation() != "PyPy":
25-
additional_mypy_args = ['--mypy']
26-
27-
additional_pycodestyle_args = []
28-
args[:] = list(set(args + additional_mypy_args + additional_pycodestyle_args))
18+
additional_pytest_args: List[str] = []
19+
args[:] = list(set(args + additional_pytest_args))

mypy.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.

pathlib3x/__init__conf__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = 'pathlib3x'
22
title = 'backport of pathlib 3.10 to python 3.6, 3.7, 3.8, 3.9 with a few extensions'
3-
version = 'v1.3.7'
3+
version = 'v1.3.8'
44
url = 'https://github.com/bitranox/pathlib3x'
55
author = 'Robert Nowotny'
66
author_email = 'bitranox@gmail.com'
@@ -14,7 +14,7 @@ def print_info() -> None:
1414
1515
backport of pathlib 3.10 to python 3.6, 3.7, 3.8, 3.9 with a few extensions
1616
17-
Version : v1.3.7
17+
Version : v1.3.8
1818
Url : https://github.com/bitranox/pathlib3x
1919
Author : Robert Nowotny
2020
Email : bitranox@gmail.com""")

pyproject.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
[tool.black]
3+
line-length = 88
4+
target-version = ['py36']
5+
# Note that you have to use single-quoted strings in TOML for regular expressions
6+
include = '\.pyi?$'
7+
exclude = '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist)/'

0 commit comments

Comments
 (0)