Skip to content

Commit

Permalink
update pre-commit hooks and CI/CD
Browse files Browse the repository at this point in the history
  • Loading branch information
saklar13 committed May 8, 2023
1 parent 6a8e6ed commit 537fac7
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 195 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/check-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: check version
on:
pull_request:
paths-ignore:
- README.md
branches:
- master
jobs:
check-version:
uses: QualiSystems/.github/.github/workflows/package-check-version.yml@master
11 changes: 11 additions & 0 deletions .github/workflows/deploy-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: deploy package
on:
release:
types: [ published ]
jobs:
tox-ci:
uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master
pypi-deploy:
needs: tox-ci
uses: QualiSystems/.github/.github/workflows/package-deploy-pypi.yml@master
secrets: inherit
13 changes: 13 additions & 0 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: github release
on:
push:
paths-ignore:
- README.md
branches:
- master
jobs:
tox-ci:
uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master
pypi-deploy:
needs: tox-ci
uses: QualiSystems/.github/.github/workflows/package-github-release.yml@master
10 changes: 10 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: package CI
on:
push:
paths-ignore:
- README.md
branches-ignore:
- master
jobs:
tox-ci:
uses: QualiSystems/.github/.github/workflows/package-tox-py-37-39.yml@master
189 changes: 0 additions & 189 deletions .github/workflows/py2-py3-packages-ci.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https://github.com/timothycrosley/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/python/black
rev: 22.3.0
rev: 22.12.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies: [
Expand All @@ -17,4 +17,4 @@ repos:
flake8-comprehensions,
flake8-print,
flake8-eradicate,
]
]
1 change: 0 additions & 1 deletion shellfoundry/utilities/template_retriever.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
TEMPLATES_YML,
)


REQUEST_TIMEOUT = 15


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
envlist =
py{37}-{master}
py{37,39}-{master}
pre-commit
build
distshare = dist
Expand Down

0 comments on commit 537fac7

Please sign in to comment.