Skip to content

Commit 0bb4b06

Browse files
bors[bot]pyup-botaragilar
authored
Merge #39 #41 #42
39: Update mock to 4.0.3 r=aragilar a=pyup-bot This PR updates [mock](https://pypi.org/project/mock) from **4.0.2** to **4.0.3**. <details> <summary>Changelog</summary> ### 4.0.3 ``` ----- - Issue 42532: Remove unexpected call of ``__bool__`` when passing a ``spec_arg`` argument to a Mock. - Issue 39966: Revert bpo-25597. :class:`unittest.mock.MagicMock` with wraps&#39; set uses default return values for magic methods. - Issue 41877: Mock objects which are not unsafe will now raise an AttributeError if an attribute with the prefix asert, aseert, or assrt is accessed, in addition to this already happening for the prefixes assert or assret. - Issue 40126: Fixed reverting multiple patches in unittest.mock. Patcher&#39;s ``__exit__()`` is now never called if its ``__enter__()`` is failed. Returning true from ``__exit__()`` silences now the exception. ``` </details> <details> <summary>Links</summary> - PyPI: https://pypi.org/project/mock - Changelog: https://pyup.io/changelogs/mock/ - Docs: http://mock.readthedocs.org/en/latest/ </details> 41: Update pytest to 6.2.1 r=aragilar a=pyup-bot This PR updates [pytest](https://pypi.org/project/pytest) from **6.1.1** to **6.2.1**. *The bot wasn't able to find a changelog for this release. [Got an idea?](https://github.com/pyupio/changelogs/issues/new)* <details> <summary>Links</summary> - PyPI: https://pypi.org/project/pytest - Homepage: https://docs.pytest.org/en/latest/ </details> 42: More to using azure pipelines r=aragilar a=aragilar Co-authored-by: pyup-bot <[email protected]> Co-authored-by: James Tocknell <[email protected]>
4 parents 9327f66 + 156ea55 + f3570cb + 1da13e0 commit 0bb4b06

File tree

9 files changed

+133
-107
lines changed

9 files changed

+133
-107
lines changed

.travis.yml

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

MANIFEST.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ recursive-include tests *.py
1010
include pylintrc
1111
include tox.ini
1212
include pypi-intro.rst
13-
include appveyor.yml
14-
include bors.toml
1513
include pylint-requirements.txt
1614
exclude .deepsource.toml
15+
exclude bors.toml
16+
exclude azure-pipelines.yml
17+
recursive-exclude ci *

appveyor.yml

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

azure-pipelines.yml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# from matplotlib's azure setup
2+
3+
4+
schedules:
5+
- cron: "0 0 * * 4"
6+
displayName: Weekly build
7+
branches:
8+
include:
9+
- releases/*
10+
always: true
11+
12+
13+
trigger:
14+
tags:
15+
include:
16+
- '*'
17+
branches:
18+
include:
19+
- '*'
20+
21+
22+
variables:
23+
PIP_CACHE_DIR: $(Pipeline.Workspace)/cache/pip
24+
25+
26+
jobs:
27+
- job: 'static_checks'
28+
pool:
29+
vmImage: ubuntu-16.04
30+
variables:
31+
TOXENV: flake8,pylint,docs,check-manifest,checkreadme
32+
steps:
33+
- task: UsePythonVersion@0
34+
inputs:
35+
versionSpec: '3.8'
36+
architecture: 'x64'
37+
- script: |
38+
pip install tox
39+
displayName: Install tox
40+
- script: |
41+
tox
42+
displayName: tox
43+
44+
- job: 'ubuntu1604'
45+
pool:
46+
vmImage: ubuntu-16.04
47+
strategy:
48+
matrix:
49+
py37:
50+
python.version: '3.7'
51+
TOXENV: py37
52+
py38:
53+
python.version: '3.8'
54+
TOXENV: py38
55+
py39:
56+
python.version: '3.9'
57+
TOXENV: py39
58+
maxParallel: 4
59+
60+
steps:
61+
- template: ci/azure-pipelines-steps.yml
62+
parameters:
63+
platform: linux
64+
65+
- job: 'macOS1015'
66+
pool:
67+
vmImage: macOS-10.15
68+
strategy:
69+
matrix:
70+
py37:
71+
python.version: '3.7'
72+
TOXENV: py37
73+
py38:
74+
python.version: '3.8'
75+
TOXENV: py38
76+
py39:
77+
python.version: '3.9'
78+
TOXENV: py39
79+
maxParallel: 4
80+
81+
steps:
82+
- template: ci/azure-pipelines-steps.yml
83+
parameters:
84+
platform: macos

bors.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
status = [
2-
"continuous-integration/travis-ci/push",
3-
#"continuous-integration/appveyor/branch",
2+
# "continuous-integration/travis-ci/push",
3+
# "continuous-integration/appveyor/branch",
4+
"stringtopy.stringtopy",
45
"codecov/patch",
56
"codecov/project",
67
]
8+

ci/azure-pipelines-steps.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
steps:
2+
- task: UsePythonVersion@0
3+
inputs:
4+
versionSpec: '$(python.version)'
5+
architecture: 'x64'
6+
displayName: 'Use Python $(python.version)'
7+
condition: and(succeeded(), ne(variables['python.version'], 'Pre'))
8+
9+
- script: |
10+
python -m pip install --upgrade pip
11+
pip install tox codecov twine wheel
12+
displayName: 'Install pip dependencies'
13+
14+
- task: TwineAuthenticate@0
15+
inputs:
16+
externalFeeds: 'pypi'
17+
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
18+
19+
- script: env
20+
displayName: 'print env'
21+
22+
- script: |
23+
tox
24+
displayName: 'tox'
25+
26+
#- script: |
27+
# codecov
28+
# displayName: 'codecov'
29+
# hopefully the bash uploader will work
30+
- script: |
31+
bash <(curl -s https://codecov.io/bash)
32+
displayName: 'Upload to codecov.io'
33+
34+
- script: |
35+
python setup.py sdist bdist_wheel
36+
twine upload --skip-existing -r pypi --config-file $(PYPIRC_PATH) dist/*
37+
displayName: 'Upload to PyPI'
38+
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

doc-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
sphinx>=1.3
22
sphinxcontrib-napoleon>=0.4.3
3-
mock==4.0.2
3+
mock==4.0.3
44
sphinx_rtd_theme==0.5.0

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pytest==6.1.1
1+
pytest==6.2.1
22
pytest-cov==2.10.1

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py37,py38,flake8,pylint,docs,check-manifest,checkreadme
7+
envlist = py37,py38,py39,flake8,pylint,docs,check-manifest,checkreadme
88

99
[testenv]
1010
commands = py.test --cov={envsitepackagesdir}/stringtopy -s {posargs}
1111
basepython =
1212
py37: {env:TOXPYTHON:python3.7}
1313
py38: {env:TOXPYTHON:python3.8}
14+
py39: {env:TOXPYTHON:python3.9}
1415
flake8: {env:TOXPYTHON:python3}
1516
pylint: {env:TOXPYTHON:python3}
1617
docs: {env:TOXPYTHON:python3}

0 commit comments

Comments
 (0)