Skip to content

Commit

Permalink
Bump cookiecutter template to e562a3 (#115)
Browse files Browse the repository at this point in the history
# Changes
- bump cookiecutter template to e562a3

---------

Co-authored-by: RKIMetadataExchange <[email protected]>
Co-authored-by: Nicolas Drebenstedt <[email protected]>
  • Loading branch information
3 people authored Mar 12, 2024
1 parent 0d4cbff commit 047203b
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"checkout": null,
"commit": "5007775061b333db615dcecd72dc8ce82696a143",
"commit": "e562a3662591b1c56806efd826d9dc777141746d",
"context": {
"cookiecutter": {
"project_name": "common",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cache-name: cache-trivy
with:
path: ~/.cache/trivy
key: ${{ env.cache-name }}-${{ hashFiles('poetry.lock') }}
key: ${{ env.cache-name }}-${{ hashFiles('*.lock') }}
restore-keys: |
${{ env.cache-name }}-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
restore-keys: |
${{ env.cache-name }}-
- name: Cache poetry
- name: Cache environment
uses: actions/cache@v4
env:
cache-name: cache-poetry
cache-name: cache-environment
with:
path: ~/.cache/pip
key: ${{ env.cache-name }}-${{ hashFiles('poetry.lock') }}
key: ${{ env.cache-name }}-${{ hashFiles('*.lock') }}
restore-keys: |
${{ env.cache-name }}-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
restore-keys: |
${{ env.cache-name }}-
- name: Cache poetry
- name: Cache environment
uses: actions/cache@v4
env:
cache-name: cache-poetry
cache-name: cache-environment
with:
path: ~/.cache/pip
key: ${{ env.cache-name }}-${{ hashFiles('poetry.lock') }}
key: ${{ env.cache-name }}-${{ hashFiles('*.lock') }}
restore-keys: |
${{ env.cache-name }}-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
restore-keys: |
${{ env.cache-name }}-
- name: Cache poetry
- name: Cache environment
uses: actions/cache@v4
env:
cache-name: cache-poetry
cache-name: cache-environment
with:
path: ~/.cache/pip
key: ${{ env.cache-name }}-${{ hashFiles('poetry.lock') }}
key: ${{ env.cache-name }}-${{ hashFiles('*.lock') }}
restore-keys: |
${{ env.cache-name }}-
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dist/
downloads/
eggs/
.eggs/
.pdm-python
lib/
lib64/
parts/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hooks:
fi; \

install: setup hooks
# run the poetry installation with embedded virtual environment
# install packages from lock file in local virtual environment
@ echo installing package; \
poetry install --no-interaction --sync; \

Expand Down
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ components of the MEx project are open-sourced under the same license as well.
- on unix, consider using pyenv https://github.com/pyenv/pyenv
- get pyenv `curl https://pyenv.run | bash`
- install 3.11 `pyenv install 3.11`
- create env `pyenv virtualenv 3.11 mex`
- go to repo root
- use env `pyenv local mex`
- switch version `pyenv global 3.11`
- run `make install`
- on windows, see https://python-poetry.org/docs/managing-environments
- install `python3.11` in your preferred way
- go to repo root
- on windows, consider using pyenv-win https://pyenv-win.github.io/pyenv-win/
- follow https://pyenv-win.github.io/pyenv-win/#quick-start
- install 3.11 `pyenv install 3.11`
- switch version `pyenv global 3.11`
- run `.\mex.bat install`

### linting and testing
Expand All @@ -75,15 +74,15 @@ components of the MEx project are open-sourced under the same license as well.
### updating dependencies

- update boilerplate files with `cruft update`
- update global dependencies in `requirements.txt` manually
- update global requirements in `requirements.txt` manually
- update git hooks with `pre-commit autoupdate`
- show outdated dependencies with `poetry show --outdated`
- update dependencies in poetry using `poetry update --lock`
- update github actions manually in `.github/workflows/*.yml`
- update github actions in `.github/workflows/*.yml` manually

### creating release

- update version, eg `poetry version minor`
- commit update `git commit --message "..." pyproject.toml`
- update version in `pyproject.toml` and `CHANGELOG.md`
- commit update `git commit --message "..."`
- create a tag `git tag ...`
- push `git push --follow-tags`
2 changes: 1 addition & 1 deletion mex.bat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if "%CI%"=="" (
if %errorlevel% neq 0 exit /b %errorlevel%
)

@REM run the poetry installation with embedded virtual environment
@REM install packages from lock file in local virtual environment
echo installing package
poetry install --no-interaction --sync
exit /b %errorlevel%
Expand Down

0 comments on commit 047203b

Please sign in to comment.