otree 6.0.0b33__tar.gz → 6.0.2__tar.gz

{otree-6.0.0b33/otree.egg-info → otree-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.0b33
+Version: 6.0.2
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org

{otree-6.0.0b33 → otree-6.0.2}/otree/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.0.0b33'
+__version__ = '6.0.2'
 # don't import anything else here because setup.py imports this.

{otree-6.0.0b33 → otree-6.0.2}/otree/cli/zip.py

@@ -95,11 +95,7 @@ def zip_project(project_path: Path):
         logger.error(str(exc))
         sys.exit(1)
 
-    # once Heroku upgrades their default python version, we can remove this runtime stuff.
-    # we should just overwrite the existing runtime. because maybe it has something old.
-    # (e.g. if it was downloaded from otree hub)
     overwrite_runtime_txt = not os.getenv('OTREE_NO_RUNTIME_TXT')
-    print_function('overwrite_runtime_txt', overwrite_runtime_txt)
     if overwrite_runtime_txt:
         runtime_txt = project_path / '.python-version'
         runtime_txt.write_text('3.12')
@@ -115,9 +111,12 @@ def zip_project(project_path: Path):
 
 def fix_reqs_files(project_path: Path) -> dict:
     rpath = project_path.joinpath('requirements.txt')
-    rbpath = project_path.joinpath('requirements_base.txt')
+
+    # If requirements.txt doesn't exist, create it with defaults
+    if not rpath.exists():
+        return {rpath.name: REQS_DEFAULT}
+
     original_rtxt = rpath.read_text('utf8')
-    original_rbtxt = rbpath.read_text('utf8') if rbpath.exists() else ''
 
     can_overwrite = False
     if OVERWRITE_TOKEN in original_rtxt:
@@ -125,7 +124,7 @@ def fix_reqs_files(project_path: Path) -> dict:
     elif DONT_OVERWRITE_TOKEN not in original_rtxt:
         ans = input(
             "Do you want oTree to automatically keep your requirements files up to date?\n"
-            "(Enter 'n' if you have custom requirements in requirements.txt or requirements_base.txt)\n"
+            "(Enter 'n' if you have custom requirements in requirements.txt)\n"
             "(y/n): "
         ).lower()
         if ans == 'y':
@@ -137,10 +136,7 @@ def fix_reqs_files(project_path: Path) -> dict:
             can_overwrite = False
 
     if can_overwrite:
-        d = {rpath.name: REQS_DEFAULT}
-        if rbpath.exists():
-            d[rbpath.name] = REQS_BASE_DEFAULT
-        return d
+        return {rpath.name: REQS_DEFAULT}
     else:
         return {}
 

{otree-6.0.0b33 → otree-6.0.2}/otree/export.py

@@ -46,7 +46,8 @@ DATA_TAB_FIXED_COLUMNS = [
 
 # Automatically derive the group column index
 GROUP_COL_INDEX = next(
-    i for i, col in enumerate(DATA_TAB_FIXED_COLUMNS)
+    i
+    for i, col in enumerate(DATA_TAB_FIXED_COLUMNS)
     if col['field'] == 'group.id_in_subsession'
 )
 
@@ -109,8 +110,8 @@ def _get_table_fields(Model, custom_fields=None, for_export=False):
 
     specs = [
         ('player', BasePlayer, ['id_in_group', 'role', 'payoff']),
-        # group.id_in_subsession is handled separately (pushed to beginning of row)
-        ('group', BaseGroup, ['id_in_subsession']),
+        # group.id_in_subsession is in DATA_TAB_FIXED_COLUMNS, not here
+        ('group', BaseGroup, []),
         # don't need round_number because it's already in the SessionData navigation toolbar
         ('subsession', BaseSubsession, []),
     ]
@@ -527,7 +528,10 @@ def get_rows_for_data_tab_app(session, app_name):
             s = subsessions[p['subsession_id']]
             try:
                 row = (
-                    [col['getter'](p, g, s, participant_label) for col in DATA_TAB_FIXED_COLUMNS]
+                    [
+                        col['getter'](p, g, s, participant_label)
+                        for col in DATA_TAB_FIXED_COLUMNS
+                    ]
                     + [p[fname] for fname in pfields]
                     + [g[fname] for fname in gfields]
                     + [s[fname] for fname in sfields]

{otree-6.0.0b33 → otree-6.0.2}/otree/models/participant.py

@@ -31,7 +31,7 @@ class Participant(MixinVars, otree.database.SSPPGModel):
     payoff = Column(CurrencyType, default=0)
 
     # status could be 'finished', 'dropped out', etc. Empty string means active/in progress
-    status = Column(st.String(50), default='')
+    status = Column(st.String(50), default='', nullable=False)
 
     # better to use a string so that it doesn't become unofficial API
     time_started_utc = Column(st.String(50), nullable=True)

{otree-6.0.0b33 → otree-6.0.2}/otree/views/admin.py

@@ -322,8 +322,6 @@ class SessionData(AdminSessionPage):
                 session=session
             ).count()
             pfields, gfields, sfields = export.get_fields_for_data_tab(app_name)
-            # Remove id_in_subsession from gfields since we handle it separately
-            gfields = [f for f in gfields if f != 'id_in_subsession']
 
             for round_number in range(1, num_rounds + 1):
                 # Build headers with indexes for sortability

{otree-6.0.0b33 → otree-6.0.2/otree.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.0b33
+Version: 6.0.2
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org