Skip to content

Commit

Permalink
Merge pull request #105 from lyz-code/ci/fix_update
Browse files Browse the repository at this point in the history
ci: remove the git hooks on the update workflow
  • Loading branch information
lyz-code committed Jun 3, 2021
2 parents 5e37e2e + b181d2c commit d0fedd8
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/lyz-code/cookiecutter-python-project",
"commit": "990a3ed0c3ea05d49e6a14b59029900a88437014",
"commit": "f38de85495097610a17385287260e26668d159cc",
"context": {
"cookiecutter": {
"project_name": "yamlfix",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
run: make all
- name: Commit files
run: |
rm -r .git/hooks
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git add requirements.txt docs/requirements.txt requirements-dev.txt
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ update:
@echo "- Updating dependencies -"
@echo "-------------------------"

pip install -U pip

rm requirements.txt
touch requirements.txt
pip-compile -Ur --allow-unsafe
Expand Down
31 changes: 17 additions & 14 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,29 @@ beautifulsoup4==4.9.3
# via mkdocs-htmlproofer-plugin
cached-property==1.5.2
# via pytkdocs
certifi==2020.12.5
certifi==2021.5.30
# via requests
chardet==4.0.0
# via requests
click==7.1.2
click==8.0.1
# via
# mkdocs
# nltk
future==0.18.2
# via lunr
gitdb==4.0.7
# via gitpython
gitpython==3.1.14
gitpython==3.1.17
# via mkdocs-git-revision-date-localized-plugin
htmlmin==0.1.12
# via mkdocs-minify-plugin
idna==2.10
# via requests
importlib-metadata==4.0.1
# via markdown
jinja2==2.11.3
importlib-metadata==4.4.0
# via
# click
# markdown
jinja2==3.0.1
# via
# mkdocs
# mkdocstrings
Expand All @@ -54,21 +56,21 @@ markdown==3.3.4
# mkdocs-material
# mkdocstrings
# pymdown-extensions
markupsafe==1.1.1
markupsafe==2.0.1
# via
# jinja2
# mkdocstrings
mkdocs-autolinks-plugin==0.4.0
# via -r docs/requirements.in
mkdocs-autorefs==0.1.1
mkdocs-autorefs==0.2.1
# via mkdocstrings
mkdocs-git-revision-date-localized-plugin==0.9.2
# via -r docs/requirements.in
mkdocs-htmlproofer-plugin==0.1.0
mkdocs-htmlproofer-plugin==0.2.0
# via -r docs/requirements.in
mkdocs-material-extensions==1.0.1
# via mkdocs-material
mkdocs-material==7.1.4
mkdocs-material==7.1.6
# via
# -r docs/requirements.in
# mkdocs-material-extensions
Expand All @@ -87,13 +89,13 @@ mkdocs==1.1.2
# mkdocs-minify-plugin
# mkdocs-section-index
# mkdocstrings
mkdocstrings==0.15.0
mkdocstrings==0.15.1
# via -r docs/requirements.in
nltk==3.6.2
# via lunr
pygments==2.9.0
# via mkdocs-material
pymdown-extensions==8.1.1
pymdown-extensions==8.2
# via
# mkdocs-material
# mkdocstrings
Expand All @@ -120,13 +122,14 @@ tornado==6.1
# via
# livereload
# mkdocs
tqdm==4.60.0
tqdm==4.61.0
# via nltk
typing-extensions==3.10.0.0
# via
# gitpython
# importlib-metadata
# pytkdocs
urllib3==1.26.4
urllib3==1.26.5
# via requests
wheel==0.36.2
# via astunparse
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exclude = '''

[tool.pytest.ini_options]
minversion = "6.0"
addopts = "-vv --tb=short"
addopts = "-vv --tb=short -n auto"
python_paths = "."
testpaths = "tests"
norecursedirs = [
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
pytest
pytest-cov
pytest-pythonpath
pytest-xdist

# Linting
yamllint
Expand Down
Loading

0 comments on commit d0fedd8

Please sign in to comment.