Merge branch 'refs/heads/master' into cv2-5001-parse-message-refactor

# Conflicts: # .gitignore
meedan · Aug 26, 2024 · aa49ec8 · aa49ec8
2 parents 542e3bf + 02ac2ac
commit aa49ec8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,3 @@
-*.cpython-39.pyc
-*.pyc
-.env_file
-.env
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -19,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -111,8 +105,10 @@ ipython_config.py
 #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
+#   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
 __pypackages__/
@@ -126,6 +122,7 @@ celerybeat.pid
 
 # Environments
 .env
+.env_file
 .venv
 env/
 venv/
@@ -162,4 +159,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-.idea/
+.idea/
diff --git a/lib/model/__pycache__/audio_model.cpython-39.pyc b/lib/model/__pycache__/audio_model.cpython-39.pyc
diff --git a/lib/model/__pycache__/fptg.cpython-39.pyc b/lib/model/__pycache__/fptg.cpython-39.pyc
diff --git a/lib/model/__pycache__/indian_sbert.cpython-39.pyc b/lib/model/__pycache__/indian_sbert.cpython-39.pyc
diff --git a/lib/model/__pycache__/meantokens.cpython-39.pyc b/lib/model/__pycache__/meantokens.cpython-39.pyc