Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cerc_persistence/db_control.py
#	cerc_persistence/repositories/city.py
#	cerc_persistence/repositories/city_object.py
#	cerc_persistence/repositories/simulation_results.py
#	tests/test_db_factory.py
#	tests/test_db_retrieve.py
This commit is contained in:
Guille 2024-03-18 11:28:55 +01:00
commit 6e5441e9d2
3 changed files with 2 additions and 4 deletions

View File

@ -1,3 +0,0 @@
# Except this file
*
!.gitignore

View File

@ -1,4 +1,4 @@
"""
CERC Persistence version number
"""
__version__ = '0.1.0.1'
__version__ = '0.1.0.2'

View File

@ -2,3 +2,4 @@ pathlib
python-dotenv
SQLAlchemy
cerc-hub
psycopg2-binary