Skip to content

Commit

Permalink
Update project template cruft, dependencies
Browse files Browse the repository at this point in the history
Applied updates from upstream project template commits:

smkent/cookie-python@4fe836a...ae5c427

*   ae5c427 Merge pull request #95 from smkent/container-version
|\
| * a813ce2 Enable and test container build in test_new_cookie_create
| * 3f2debd Update docker action versions in template's container.yml
| * 9ac5896 Escape `{{` in template container.yml
| * a99ca57 Fix container build with updated poetry-dynamic-versioning
|/
*   41468dd Merge pull request #94 from smkent/pyupgrade-keep-runtime-typing
|\
| * 82b8568 Add --keep-runtime-typing to pyupgrade args
|/
*   c83e9f4 Merge pull request #93 from smkent/manage-run-env
|\
| * 4a161e4 Include PYTHON_KEYRING_BACKEND in repo run commands env
|/
*   f6ac9b1 Merge pull request #92 from smkent/manage-update-pr-html-url
|\
| * 30372bf Log opened PR's HTML URL instead of API URL in manage-cookie update
|/
*   26efcfa Merge pull request #91 from smkent/manage-cookie
|\
| * 91b6a89 Set PYTHON_KEYRING_BACKEND for poetry within unit tests
| * cf0f69a Apply automatic linting fixes
| * 582d618 Update project template cruft
|/
*   c4899ec Merge pull request #90 from smkent/cruft-json-reset
|\
| * f61ed02 Replace repo_reset with .cruft.json checkout
|/
*   f5e42d6 Merge pull request #88 from smkent/autoflake-pyupgrade
|\
| *   0d9d2ea Merge branch 'main' into autoflake-pyupgrade
| |\
| |/
|/|
* |   a4fec71 Merge pull request #89 from smkent/fix-pyproject-version
|\ \
| * | 62b1b68 Configure pyproject.toml build-backend for poetry-dynamic-versioning
| * | 85d5f74 Enable poetry-dynamic-versioning in pyproject.toml
| * | 549fc6e Update python-poetry action from template
| * | 1001f3e Add __version__.py
| * | 42f765f Remove fixed version string from pyproject.toml
|/ /
| * d5f398c Add autoflake to pre-commit config
| * dda7315 Add pyupgrade to pre-commit config
|/
*   429b0c8 Merge pull request #87 from smkent/manage-cookie-branch-name
|\
| * 21aceda Tweak manage-cookie branch name
|/
*   a3f5e77 Merge pull request #86 from smkent/update-cookie
|\
| * a7ec03b Update dependencies
|/
*   432da6a Merge pull request #85 from smkent/reference-self-current-dir
|\
| * 3368613 Reference own template via current directory instead of URL
|/
*   8ea43c8 Merge pull request #84 from smkent/skip-empty-updates
|\
| * 0199bed Rework repository reset as a decorator
| * ee6e1de Reset repository working directory if skipping cruft update
| * 41940ba Capture output in git status command
| * 508f99d Skip cruft updates without template modifications
|/
*   1b2d5ae Merge pull request #83 from smkent/ci-cd-pypi
|\
| * 3366570 Enable publishing to PyPI
| * 77d2309 Apply CI/CD workflow updates from template
|/
*   2c96f9e Merge pull request #82 from smkent/readme-badges
|\
| *   5820d18 Merge remote-tracking branch 'origin/main' into readme-badges
| |\
| |/
|/|
* |   c49a336 Merge pull request #81 from smkent/manage-main-loop
|\ \
| * | 653af5b Move repository iteration loop to manage-cookie main function
|/ /
| * 0de67eb Add PyPI badges to README.md
| * 01a9943 Add codecov badge to README.md
|/
*   de9e951 Merge pull request #80 from smkent/github-api
|\
| * 3343a19 Remove now-unused subprocess.run mock
| * d4fe333 Use PyGithub to create and locate releases
| * 77109a6 Mock PyGithub in unit tests, rename API token env var
| * b523f8e Use PyGithub for pull request creation, deletion
| * 7ef5da8 Use PyGithub to resolve repository from CLI params
| * 101cf80 Add pygithub
|/
*   faaf379 Merge pull request #78 from smkent/replace-pr
|\
| * 39a7465 Log opened PR URL
| * e89cc06 Close existing PR on update
| * 0305500 Don't check for existing branch on remote at clone time
* c21e45e Merge pull request #79 from smkent/release-log-fixup
* 163d273 Fix release log message wording

Updated project dependencies via `poetry update`:

Package operations: 0 installs, 3 updates, 0 removals

- Updating setuptools (67.3.3 -> 67.4.0)
- Updating coverage (7.1.0 -> 7.2.0)
- Updating pre-commit (3.0.4 -> 3.1.0)
  • Loading branch information
smkent committed Feb 23, 2023
1 parent 1750d15 commit a28c5f4
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 62 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/smkent/cookie-python",
"commit": "4fe836a1166d38f1e6aab9fba38d7a5bfce95213",
"commit": "ae5c42761c7903b4c6238c1c6e8f91121866db89",
"context": {
"cookiecutter": {
"project_name": "jmapc",
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/actions/python-poetry/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ runs:
python-version: ${{ inputs.python_version }}
cache: poetry

- name: 🛠️ Install project dependencies
- name: 🛠️ Install project and dependencies
shell: bash
env:
# https://github.com/python-poetry/poetry/issues/1917
Expand All @@ -35,8 +35,10 @@ runs:
run: |
poetry install
poetry lock --check
[ "$(poetry version -s)" != "0.0.0" ] \
PROJECT_VERSION=$(poetry version -s)
[ "${PROJECT_VERSION}" != "0.0.0" ] \
|| { echo "Versioning broken"; exit 1; }
echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
- name: 🪝 Cache pre-commit hooks
uses: actions/cache@v3
Expand Down
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ repos:
- flake8-pyproject
- flake8-simplify
- pep8-naming
- repo: https://github.com/pycqa/autoflake
rev: v2.0.1
hooks:
- id: autoflake
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
args: ["--keep-runtime-typing"]
- repo: local
hooks:
- id: mypy
Expand Down
116 changes: 58 additions & 58 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = ["poetry-core>=1.2.0", "poetry-dynamic-versioning"]
build-backend = "poetry.core.masonry.api"
build-backend = "poetry_dynamic_versioning.backend"

[tool.poetry]
name = "jmapc"
Expand Down

0 comments on commit a28c5f4

Please sign in to comment.