Skip to content

Commit

Permalink
Merge pull request #16 from pyscaffold/dev
Browse files Browse the repository at this point in the history
Solve pre-commit cirrus cache issues
  • Loading branch information
FlorianWilhelm committed Feb 5, 2021
2 parents 0d15c1c + 9279c79 commit 3ac6c33
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
18 changes: 11 additions & 7 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ env:

# This template is used in most of the tasks
.regular_task_template: &REGULAR_TASK_TEMPLATE
pip_cache: &pip-cache
folder: $PIP_CACHE
pre_commit_cache: &pre-commit-cache
folder: $PRE_COMMIT_HOME
tox_install_script:
- python -m pip install --upgrade pip setuptools tox
- python -m pip install --upgrade pip setuptools tox pre-commit
prepare_script: &prepare
# This script is also used in Windows, so the shell is not POSIX
- git config --global user.email "you@example.com"
Expand All @@ -37,7 +33,15 @@ env:
path: junit-*.xml
format: junit
type: text/xml

pip_cache: &pip-cache
folder: $PIP_CACHE
pre_commit_cache: &pre-commit-cache
folder: $PRE_COMMIT_HOME
fingerprint_script:
- echo $CIRRUS_OS
- python --version
- pre-commit --version
- cat .pre-commit-config.yaml

# ---- Task definitions ----

Expand Down Expand Up @@ -162,7 +166,7 @@ windows_task:
# Set Windows encoding to UTF-8
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v Autorun /t REG_SZ /d "@chcp 65001>nul" /f
- python -m ensurepip
- python -m pip install --upgrade --user pip setuptools certifi tox
- python -m pip install --upgrade --user pip setuptools certifi tox pre-commit
prepare_script: *prepare
clean_workspace_script:
# Avoid information carried from one run to the other
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Version 0.4.1
Version 0.4
===========

- Add a `.gitignore` also in the `data` folder
- Changed wording in `README.md`
- Add a ``.gitignore`` also in the ``data`` folder
- Changed wording in ``README.md``

Version 0.3.1
=============
Expand Down

0 comments on commit 3ac6c33

Please sign in to comment.