Skip to content

Commit

Permalink
Apply cruft updates
Browse files Browse the repository at this point in the history
  • Loading branch information
allenporter committed Nov 30, 2024
1 parent 2bbef74 commit ccde462
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 4 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/allenporter/cookiecutter-python",
"commit": "ae5501352e9a6fe363996818fc2b4c82f5816450",
"commit": "d2c63d2a4c218441b0c26bd4aac7b744b85684bb",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
42 changes: 42 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ parts/
sdist/
var/
wheels/
<<<<<<< ours
pip-wheel-metadata/
=======
>>>>>>> theirs
share/python-wheels/
*.egg-info/
.installed.cfg
Expand Down Expand Up @@ -50,6 +53,10 @@ coverage.xml
*.py,cover
.hypothesis/
.pytest_cache/
<<<<<<< ours
=======
cover/
>>>>>>> theirs

# Translations
*.mo
Expand All @@ -72,6 +79,10 @@ instance/
docs/_build/

# PyBuilder
<<<<<<< ours
=======
.pybuilder/
>>>>>>> theirs
target/

# Jupyter Notebook
Expand All @@ -82,7 +93,13 @@ profile_default/
ipython_config.py

# pyenv
<<<<<<< ours
.python-version
=======
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version
>>>>>>> theirs

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
Expand All @@ -91,7 +108,28 @@ ipython_config.py
# install all needed dependencies.
#Pipfile.lock

<<<<<<< ours
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
=======
# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
.pdm.toml
.pdm-python
.pdm-build/

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
>>>>>>> theirs
__pypackages__/

# Celery stuff
Expand Down Expand Up @@ -125,7 +163,11 @@ venv.bak/
.dmypy.json
dmypy.json

<<<<<<< ours
# Pyre type checker
.pyre/

docs/
=======
.DS_Store
>>>>>>> theirs
1 change: 1 addition & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
[lint]
ignore = ["E501"]
9 changes: 6 additions & 3 deletions script/run-mypy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ set -o errexit
# other common virtualenvs
my_path=$(git rev-parse --show-toplevel)

if [ -f "${my_path}/venv/bin/activate" ]; then
. "${my_path}/venv/bin/activate"
fi
for venv in venv .venv .; do
if [ -f "${my_path}/${venv}/bin/activate" ]; then
. "${my_path}/${venv}/bin/activate"
break
fi
done

mypy ${my_path}

0 comments on commit ccde462

Please sign in to comment.