Skip to content

Commit

Permalink
Clean - Improve precommit config and remove trailing withespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Guts committed Dec 26, 2019
1 parent e1a2bd9 commit c138494
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 17 deletions.
28 changes: 18 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: ^(.venv_packaging/|.venv_tests/|.venv*/|tests/dev/|tests/fixtures/)
fail_fast: true
repos:
- repo: https://github.com/python/black
rev: 19.3b0
hooks:
- id: black
name: black
description: 'Formatting code using Black'
exclude_types: [directory,]
language_version: python3
log_file: dev_precommit.log
types: [file, python]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
hooks:
- id: trailing-whitespace
- id: check-yaml
- id: detect-private-key
- repo: https://github.com/python/black
rev: 19.10b0
hooks:
- id: black
exclude_types: [directory,]
language_version: python3
log_file: ./dev_precommit.log
require_serial: true
types: [file, python]
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
fetchDepth: 10

- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
Expand Down Expand Up @@ -92,7 +92,7 @@ stages:
buildType: "current"
artifact: "FORMATTED_$(pyPiPackageName)_$(Build.SourceBranchName)_$(Build.BuildId)"
targetPath: "$(System.DefaultWorkingDirectory)"

- task: UsePythonVersion@0
inputs:
versionSpec: '$(python.version)'
Expand Down Expand Up @@ -228,8 +228,8 @@ stages:
changeLogType: 'commitBased'

# PUBLISH TO the Python Package Index (PyPi)
# only with a tagged commit (see: https://github.com/MicrosoftDocs/vsts-docs/issues/3281)
- job: 'DeployPyPi'
# only with a tagged commit (see: https://github.com/MicrosoftDocs/vsts-docs/issues/3281)
- job: 'DeployPyPi'
dependsOn: Build
condition: |
and
Expand Down
2 changes: 1 addition & 1 deletion isogeo_pysdk/samples/samples_boundingbox.geojson
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "FeatureCollection",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
"bbox": [ -109.738827437861, -35.8235059887639, 58.2896680242212, 48.9467629644496 ],
"bbox": [ -109.738827437861, -35.8235059887639, 58.2896680242212, 48.9467629644496 ],
"features": [
{ "type": "Feature", "properties": { "id": 1, "name": "PBW Events" }, "bbox": [ 2.174567705830178, 48.618408385167932, 2.579169415881337, 48.946762964449569 ], "geometry": { "type": "Polygon", "coordinates": [ [ [ 2.2397467047138, 48.934465040131904 ], [ 2.31230445818802, 48.946762964449569 ], [ 2.31230445818802, 48.946762964449569 ], [ 2.395930343548137, 48.943073587154274 ], [ 2.574250246154271, 48.861907286657683 ], [ 2.579169415881337, 48.663910705143287 ], [ 2.373794079776342, 48.618408385167932 ], [ 2.174567705830178, 48.629476517053831 ], [ 2.2397467047138, 48.934465040131904 ] ] ] } },
{ "type": "Feature", "properties": { "id": 2, "name": "La Réunion - AH" }, "bbox": [ 54.189154810385681, -22.581765019733755, 57.036733431104786, -19.892499806993939 ], "geometry": { "type": "Polygon", "coordinates": [ [ [ 54.568831959814887, -20.35594487016747 ], [ 55.935669697760062, -19.892499806993939 ], [ 56.619088566732643, -20.747008661495475 ], [ 57.036733431104786, -21.843621587104487 ], [ 56.049572842588816, -22.581765019733755 ], [ 54.758670534529493, -22.441466473313262 ], [ 54.189154810385681, -21.490771598408379 ], [ 54.568831959814887, -20.35594487016747 ] ] ] } },
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ tee = True
description-file = README.md

[tool:pytest]
addopts =
addopts =
--junitxml=junit/test-results.xml
--cov-config=.coveragerc
--cov=isogeo_pysdk
Expand Down
2 changes: 1 addition & 1 deletion tests/test_about.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""Usage from the repo root folder:
.. code-block:: python
# for whole test
python -m unittest tests.test_about
Expand Down

0 comments on commit c138494

Please sign in to comment.