Skip to content

Commit

Permalink
Apply updates from upstream project template
Browse files Browse the repository at this point in the history
Applied upstream commits:

smkent/cookie-python@a893079...eb6af6b

*   eb6af6b Merge pull request #70 from smkent/verify-lock-file
|\
| * 186b021 Check poetry.lock matches pyproject.toml during Poetry setup in CI
|/
*   63310b6 Merge pull request #69 from smkent/pre-commit-dev-dependencies
|\
| * e9f59fa Move pre-commit to dev-dependencies
|/
*   ca40711 Merge pull request #68 from smkent/refresh-lockfile
|\
| * 7911d26 Refresh poetry.lock
|/
* 902ad00 Merge pull request #67 from smkent/deduplicate-poetry-in-readme
* 4e421a5 Remove duplicate poetry installatio instructions from README.md
  • Loading branch information
smkent committed Nov 10, 2022
1 parent ccb705d commit d70852c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 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": "a893079686fd02969c4f1858dbcd687430035b86",
"commit": "eb6af6b06cfd2d0d33d899a24e3f79259b481370",
"context": {
"cookiecutter": {
"project_name": "jmapc",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/actions/python-poetry/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ runs:
PYTHON_KEYRING_BACKEND: "keyring.backends.null.Keyring"
run: |
poetry install
poetry lock --check
[ "$(poetry version -s)" != "0.0.0" ] \
|| { echo "Versioning broken"; exit 1; }
Expand Down
24 changes: 12 additions & 12 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
Expand Up @@ -25,7 +25,6 @@ include = [
[tool.poetry.dependencies]
python = "^3.8"
dataclasses-json = "^0.5.6"
pre-commit = "*"
python-dateutil = "^2.8.2"
requests = "^2.27.1"
sseclient = "^0.0.27"
Expand All @@ -42,6 +41,7 @@ isort = "*"
mypy = "*"
pep8-naming = "*"
poethepoet = "*"
pre-commit = "*"
py = "1.11.0" # https://github.com/Teemu/pytest-sugar/issues/241
pytest = "*"
pytest-cov = "*"
Expand Down

0 comments on commit d70852c

Please sign in to comment.