Merge remote-tracking branch 'origin/main' into release/2.024.17

kobotoolbox · Jun 4, 2024 · 2dd751f · 2dd751f
2 parents b89d3a8 + 33d4054
commit 2dd751f
Show file tree

Hide file tree

Showing 31 changed files with 444 additions and 390 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ['3.8', '3.10']
+        python-version: ['3.8', '3.10', '3.12']
     services:
       postgres:
         image: postgis/postgis:14-3.2

diff --git a/README.md b/README.md
@@ -68,22 +68,22 @@ instructions on how to install KoboToolbox.
 To generate a locale from scratch (ex. Spanish)
 
 ``` sh
-$ django-admin.py makemessages -l es -e py,html,email,txt ;
-$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin.py makemessages -d djangojs -l es && cd - ; done
+$ django-admin makemessages -l es -e py,html,email,txt ;
+$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin makemessages -d djangojs -l es && cd - ; done
 ```
 
 To update PO files
 
 ``` sh
-$ django-admin.py makemessages -a ;
-$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin.py makemessages -d djangojs -a && cd - ; done
+$ django-admin makemessages -a ;
+$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin makemessages -d djangojs -a && cd - ; done
 ```
 
 To compile MO files and update live translations
 
 ``` sh
-$ django-admin.py compilemessages ;
-$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin.py compilemessages && cd - ; done
+$ django-admin compilemessages ;
+$ for app in {main,viewer} ; do cd kobocat/apps/${app} && django-admin compilemessages && cd - ; done
 ```
 ## Testing in KoboCAT
 

diff --git a/conftest.py b/conftest.py
@@ -58,7 +58,7 @@ def setup(request):
                     toggle_capturing(capture_manager, stop=False)
                 pytest.exit('User interrupted tests', pytest.ExitCode.INTERRUPTED)
 
-    if 'instances' in settings.MONGO_DB.collection_names():
+    if 'instances' in settings.MONGO_DB.list_collection_names():
         response = stderr_prompt(
             '\n\n'
             'WARNING: the MongoDB collection {}.instances already exists!\n'

diff --git a/dependencies/pip/dev_requirements.in b/dependencies/pip/dev_requirements.in
@@ -1,7 +1,7 @@
 -r requirements.in
 
 ipdb
-ipython
+ipython==8.12.3 # Max supported version by Python 3.8
 shell_command
 sqlparse
 pytest