Skip to content

Commit

Permalink
Merge #43
Browse files Browse the repository at this point in the history
43: Restyle More to using azure pipelines r=aragilar a=restyled-io[bot]


Automated style fixes for #42, created by [Restyled][].

The following restylers [made fixes](https://restyled.io/gh/aragilar/repos/stringtopy/jobs/489018):

- prettier-yaml
- whitespace


To incorporate these changes, merge this Pull Request into the original. We
recommend using the Squash or Rebase strategies.


**NOTE**: As work continues on the original Pull Request, this process will
re-run and update (force-push) this Pull Request with updated style fixes as
necessary. If the style is fixed manually at any point (i.e. this process finds
no fixes to make), this Pull Request will be closed automatically.

Sorry if this was unexpected. To disable it, see our [documentation][].

[restyled]: https://restyled.io
[documentation]: https://github.com/restyled-io/restyled.io/wiki/Disabling-Restyled



Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
bors[bot] and restyled-commits authored Dec 31, 2020
2 parents 0ce5322 + d9412a0 commit b113614
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 99 deletions.
128 changes: 62 additions & 66 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,84 +1,80 @@
# from matplotlib's azure setup


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

- 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: "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
- 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
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
- 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
steps:
- template: ci/azure-pipelines-steps.yml
parameters:
platform: macos
1 change: 0 additions & 1 deletion bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ status = [
"codecov/patch",
"codecov/project",
]

62 changes: 31 additions & 31 deletions ci/azure-pipelines-steps.yml
Original file line number Diff line number Diff line change
@@ -1,38 +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'))
- 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'
- 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/')
- task: TwineAuthenticate@0
inputs:
externalFeeds: "pypi"
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

- script: env
displayName: 'print env'
- script: env
displayName: "print env"

- script: |
tox
displayName: 'tox'
- 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: |
# 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/')
- 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 tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ commands=

[testenv:check-manifest]
deps=check-manifest
setenv =
setenv =
CHECK_MANIFEST=true
commands=
check-manifest
Expand Down

0 comments on commit b113614

Please sign in to comment.