Skip to content

Commit

Permalink
Merge #39 #41 #42
Browse files Browse the repository at this point in the history
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 <github-bot@pyup.io>
Co-authored-by: James Tocknell <aragilar@gmail.com>
  • Loading branch information
3 people authored Dec 31, 2020
4 parents 9327f66 + 156ea55 + f3570cb + 0ce5322 commit aa4700d
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 107 deletions.
56 changes: 0 additions & 56 deletions .travis.yml

This file was deleted.

5 changes: 3 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ recursive-include tests *.py
include pylintrc
include tox.ini
include pypi-intro.rst
include appveyor.yml
include bors.toml
include pylint-requirements.txt
exclude .deepsource.toml
exclude bors.toml
exclude azure-pipelines.yml
recursive-exclude ci *
44 changes: 0 additions & 44 deletions appveyor.yml

This file was deleted.

84 changes: 84 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# from matplotlib's azure setup


schedules:
- cron: "0 0 * * 4"
displayName: Weekly build
branches:
include:
- releases/*
always: true


trigger:
tags:
include:
- '*'
branches:
include:
- '*'


variables:
PIP_CACHE_DIR: $(Pipeline.Workspace)/cache/pip


jobs:
- job: 'static_checks'
pool:
vmImage: ubuntu-16.04
variables:
TOXENV: flake8,pylint,docs,check-manifest,checkreadme
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
architecture: 'x64'
- script: |
pip install tox
displayName: Install tox
- script: |
tox
displayName: tox
- job: 'ubuntu1604'
pool:
vmImage: ubuntu-16.04
strategy:
matrix:
py37:
python.version: '3.7'
TOXENV: py37
py38:
python.version: '3.8'
TOXENV: py38
py39:
python.version: '3.9'
TOXENV: py39
maxParallel: 4

steps:
- template: ci/azure-pipelines-steps.yml
parameters:
platform: linux

- job: 'macOS1015'
pool:
vmImage: macOS-10.15
strategy:
matrix:
py37:
python.version: '3.7'
TOXENV: py37
py38:
python.version: '3.8'
TOXENV: py38
py39:
python.version: '3.9'
TOXENV: py39
maxParallel: 4

steps:
- template: ci/azure-pipelines-steps.yml
parameters:
platform: macos
6 changes: 4 additions & 2 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
status = [
"continuous-integration/travis-ci/push",
#"continuous-integration/appveyor/branch",
# "continuous-integration/travis-ci/push",
# "continuous-integration/appveyor/branch",
"aragilar.stringtopy",
"codecov/patch",
"codecov/project",
]

38 changes: 38 additions & 0 deletions ci/azure-pipelines-steps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '$(python.version)'
architecture: 'x64'
displayName: 'Use Python $(python.version)'
condition: and(succeeded(), ne(variables['python.version'], 'Pre'))

- script: |
python -m pip install --upgrade pip
pip install tox codecov twine wheel
displayName: 'Install pip dependencies'

- task: TwineAuthenticate@0
inputs:
externalFeeds: 'pypi'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

- script: env
displayName: 'print env'

- script: |
tox
displayName: 'tox'

#- script: |
# codecov
# displayName: 'codecov'
# hopefully the bash uploader will work
- script: |
bash <(curl -s https://codecov.io/bash)
displayName: 'Upload to codecov.io'

- script: |
python setup.py sdist bdist_wheel
twine upload --skip-existing -r pypi --config-file $(PYPIRC_PATH) dist/*
displayName: 'Upload to PyPI'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
2 changes: 1 addition & 1 deletion doc-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sphinx>=1.3
sphinxcontrib-napoleon>=0.4.3
mock==4.0.2
mock==4.0.3
sphinx_rtd_theme==0.5.0
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest==6.1.1
pytest==6.2.1
pytest-cov==2.10.1
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
# and then run "tox" from this directory.

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

[testenv]
commands = py.test --cov={envsitepackagesdir}/stringtopy -s {posargs}
basepython =
py37: {env:TOXPYTHON:python3.7}
py38: {env:TOXPYTHON:python3.8}
py39: {env:TOXPYTHON:python3.9}
flake8: {env:TOXPYTHON:python3}
pylint: {env:TOXPYTHON:python3}
docs: {env:TOXPYTHON:python3}
Expand Down

0 comments on commit aa4700d

Please sign in to comment.