Compare commits

..

No commits in common. 'main' and 'lzc_branch' have entirely different histories.

25
.gitignore vendored

@ -1,4 +1,3 @@
# ---> Python
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[codz]
@ -47,11 +46,7 @@ htmlcov/
nosetests.xml
coverage.xml
*.cover
<<<<<<< HEAD
*.py,cover
=======
*.py.cover
>>>>>>> master
.hypothesis/
.pytest_cache/
cover/
@ -99,31 +94,18 @@ ipython_config.py
# install all needed dependencies.
#Pipfile.lock
<<<<<<< HEAD
=======
# UV
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
#uv.lock
>>>>>>> master
# 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
<<<<<<< HEAD
# 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/#use-with-ide
.pdm.toml
=======
#poetry.toml
# pdm
@ -141,7 +123,6 @@ ipython_config.py
# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
# in the .venv directory. It is recommended not to include this directory in version control.
.pixi
>>>>>>> master
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/
@ -155,10 +136,7 @@ celerybeat.pid
# Environments
.env
<<<<<<< HEAD
=======
.envrc
>>>>>>> master
.venv
env/
venv/
@ -197,8 +175,6 @@ cython_debug/
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
<<<<<<< HEAD
=======
# Abstra
# Abstra is an AI-powered process automation framework.
# Ignore directories containing user credentials, local state, and settings.
@ -229,4 +205,3 @@ cython_debug/
marimo/_static/
marimo/_lsp/
__marimo__/
>>>>>>> master

@ -1 +1 @@
# DjangoBlog_homework
# DjangoBlog_homework
Loading…
Cancel
Save