Skip to content

Commit

Permalink
Update deps + flow changes into inner repo (#221)
Browse files Browse the repository at this point in the history
* Update deps + flow changes into inner repo

* Upgrade to Python 3.12.2

* Downgrade to Python 3.12.1 due to pyenv-actions + rename venv
  • Loading branch information
john-sandall committed Apr 21, 2024
1 parent 1b232c9 commit 0f2a95a
Show file tree
Hide file tree
Showing 13 changed files with 328 additions and 325 deletions.
1 change: 1 addition & 0 deletions .changelog/221.maintenance
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated dependencies + renamed venv
6 changes: 3 additions & 3 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip==23.1.2
poetry==1.4.2
virtualenv==20.23.0
pip==23.2.1
poetry==1.5.1
virtualenv==20.24.3
2 changes: 1 addition & 1 deletion .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@
}
],
"results": {},
"generated_at": "2023-04-06T12:53:45Z"
"generated_at": "2024-04-21T16:31:19Z"
}
2 changes: 1 addition & 1 deletion .venv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
coefficient-cookiecutter
modern-data-cookiecutter
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ towncrier build --version=0.2
# Confirm your update is now in CHANGELOG.md

# Test out pre-commit
detect-secrets --verbose scan \
--exclude-files 'poetry\.lock' \
--exclude-files '\.secrets\.baseline' \
--exclude-files '\.env\.template' \
--exclude-secrets 'password|ENTER_PASSWORD_HERE|INSERT_API_KEY_HERE' \
--exclude-lines 'integrity=*sha' \
> .secrets.baseline

pre-commit run --all-files --hook-stage=manual --show-diff-on-failure

# Clean up
Expand Down
4 changes: 3 additions & 1 deletion cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
"use_dependabot": "y",
"repo_url": "https://github.com/username/repo",
"issue_url": "https://github.com/username/repo/issues/",
"_copy_without_render": ["*.changelog/template.md"]
"_copy_without_render": [
"*.changelog/template.md"
]
}
575 changes: 289 additions & 286 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ requests = "^2.31.0"
detect-secrets = "1.2.0"
ipdb = "^0.13.13"
pip-audit = "^2.5.5"
pre-commit = "^3.3.2"
pre-commit = "^3.3.3"
pylint = "^2.17.4"
pytest = "^7.3.1"
towncrier = "^22.12.0"
pytest = "^7.4.0"
ruff = "^0.1.14"
towncrier = "^22.12.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down Expand Up @@ -110,6 +110,7 @@ convention = "pep257"
[tool.ruff.format]
quote-style = "double"
indent-style = "space"

##############
# 📣 Towncrier
##############
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
arrow==1.3.0 ; python_version >= "3.12" and python_version < "4.0"
binaryornot==0.4.4 ; python_version >= "3.12" and python_version < "4.0"
certifi==2023.11.17 ; python_version >= "3.12" and python_version < "4.0"
certifi==2024.2.2 ; python_version >= "3.12" and python_version < "4.0"
chardet==5.2.0 ; python_version >= "3.12" and python_version < "4.0"
charset-normalizer==3.3.2 ; python_version >= "3.12" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.12" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.12" and python_version < "4.0" and platform_system == "Windows"
cookiecutter==2.5.0 ; python_version >= "3.12" and python_version < "4.0"
idna==3.6 ; python_version >= "3.12" and python_version < "4.0"
cookiecutter==2.6.0 ; python_version >= "3.12" and python_version < "4.0"
idna==3.7 ; python_version >= "3.12" and python_version < "4.0"
jinja2==3.1.3 ; python_version >= "3.12" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.12" and python_version < "4.0"
markupsafe==2.1.4 ; python_version >= "3.12" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.12" and python_version < "4.0"
mdurl==0.1.2 ; python_version >= "3.12" and python_version < "4.0"
mypy-extensions==1.0.0 ; python_version >= "3.12" and python_version < "4.0"
mypy==1.8.0 ; python_version >= "3.12" and python_version < "4.0"
mypy==1.9.0 ; python_version >= "3.12" and python_version < "4.0"
pygments==2.17.2 ; python_version >= "3.12" and python_version < "4.0"
python-dateutil==2.8.2 ; python_version >= "3.12" and python_version < "4.0"
python-slugify==8.0.1 ; python_version >= "3.12" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0"
python-slugify==8.0.4 ; python_version >= "3.12" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.12" and python_version < "4.0"
requests==2.31.0 ; python_version >= "3.12" and python_version < "4.0"
rich==13.7.0 ; python_version >= "3.12" and python_version < "4.0"
rich==13.7.1 ; python_version >= "3.12" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.12" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.12" and python_version < "4.0"
types-python-dateutil==2.8.19.20240106 ; python_version >= "3.12" and python_version < "4.0"
typing-extensions==4.9.0 ; python_version >= "3.12" and python_version < "4.0"
urllib3==2.1.0 ; python_version >= "3.12" and python_version < "4.0"
types-python-dateutil==2.9.0.20240316 ; python_version >= "3.12" and python_version < "4.0"
typing-extensions==4.11.0 ; python_version >= "3.12" and python_version < "4.0"
urllib3==2.2.1 ; python_version >= "3.12" and python_version < "4.0"
6 changes: 3 additions & 3 deletions {{cookiecutter.repo_name}}/.github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip==23.1.2
poetry==1.4.2
virtualenv==20.23.0
pip==23.2.1
poetry==1.5.1
virtualenv==20.24.3
4 changes: 2 additions & 2 deletions {{cookiecutter.repo_name}}/.pre-commit-config.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_language_version:
python: python{{ '.'.join(cookiecutter.python_version.split('.')[:2]) }}
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
name: Check for a blank line at the end of scripts (auto-fixes)
Expand Down Expand Up @@ -84,7 +84,7 @@ repos:
# "--without-hashes",
# ]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.9-for-vscode
rev: v4.0.0-alpha.8
hooks:
- id: prettier
types_or: [yaml]
Expand Down
5 changes: 2 additions & 3 deletions {{cookiecutter.repo_name}}/pyproject.template.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ python = "^{{ cookiecutter.python_version }}"

[tool.poetry.dev-dependencies]
# Everything below here is alphabetically sorted
bandit = "^1.7.5"
detect-secrets = "1.2.0"
ipdb = "^0.13.13"
pip-audit = "^2.5.5"
pre-commit = "^3.3.2"
pytest = "^7.3.1"
pre-commit = "^3.3.3"
pytest = "^7.4.0"
ruff = "^0.1.14"
{% if cookiecutter.use_towncrier == 'y' -%}
towncrier = "^22.12.0"{% endif %}
Expand Down
11 changes: 0 additions & 11 deletions {{cookiecutter.repo_name}}/setup.cfg

This file was deleted.

0 comments on commit 0f2a95a

Please sign in to comment.