Merge pull request #927 from ricequant/hotfix/add_reits

Cuizi7 · web-flow · commit faed23cd019c · 2025-07-28T09:56:58.000+08:00
Hotfix/add reits
diff --git a/rqalpha/const.py b/rqalpha/const.py
@@ -157,6 +157,7 @@ class INSTRUMENT_TYPE(CustomEnum):
     CONVERTIBLE = "Convertible"
     SPOT = "Spot"
     REPO = "Repo"
+    REITs = "REITs"
 
 
 # noinspection PyPep8Naming
diff --git a/rqalpha/data/base_data_source/data_source.py b/rqalpha/data/base_data_source/data_source.py
@@ -67,7 +67,7 @@
 class BaseDataSource(AbstractDataSource):
     DEFAULT_INS_TYPES = (
         INSTRUMENT_TYPE.CS, INSTRUMENT_TYPE.FUTURE, INSTRUMENT_TYPE.ETF, INSTRUMENT_TYPE.LOF, INSTRUMENT_TYPE.INDX,
-        INSTRUMENT_TYPE.PUBLIC_FUND,
+        INSTRUMENT_TYPE.PUBLIC_FUND, INSTRUMENT_TYPE.REITs
     )
 
     def __init__(self, path: str, custom_future_info: dict, *args, **kwargs) -> None:
diff --git a/rqalpha/mod/rqalpha_mod_sys_accounts/mod.py b/rqalpha/mod/rqalpha_mod_sys_accounts/mod.py
@@ -78,6 +78,7 @@ def start_up(self, env, mod_config):
                         env.add_frontend_validator(ins_validator, INSTRUMENT_TYPE.CONVERTIBLE)
                         env.add_frontend_validator(ins_validator, INSTRUMENT_TYPE.INDX)
                         env.add_frontend_validator(ins_validator, INSTRUMENT_TYPE.PUBLIC_FUND)
+                        env.add_frontend_validator(ins_validator, INSTRUMENT_TYPE.REITs)
                     else:
                         user_system_log.warn("rqdatac not init, not support financing stocks restriction.")
                 except ImportError:
diff --git a/rqalpha/utils/__init__.py b/rqalpha/utils/__init__.py
@@ -136,7 +136,8 @@ def account_type_str2enum(type_str):
     INSTRUMENT_TYPE.ETF,
     INSTRUMENT_TYPE.LOF,
     INSTRUMENT_TYPE.INDX,
-    INSTRUMENT_TYPE.PUBLIC_FUND
+    INSTRUMENT_TYPE.PUBLIC_FUND,
+    INSTRUMENT_TYPE.REITs
 ]
 
 
diff --git a/setup.cfg b/setup.cfg
@@ -5,7 +5,7 @@
 
 [metadata]
 name = rqalpha
-version = 5.5.4
+version = 5.6.0
 
 [versioneer]
 VCS = git
diff --git a/setup.py b/setup.py
@@ -84,6 +84,7 @@
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     python_requires=">=3.6"
 )
diff --git a/tests/outs/test_f_mean_reverting.pkl b/tests/outs/test_f_mean_reverting.pkl
diff --git a/tests/outs/test_f_tick_size.pkl b/tests/outs/test_f_tick_size.pkl

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`class BaseDataSource(AbstractDataSource):`
`68`	`68`	`DEFAULT_INS_TYPES = (`
`69`	`69`	`INSTRUMENT_TYPE.CS, INSTRUMENT_TYPE.FUTURE, INSTRUMENT_TYPE.ETF, INSTRUMENT_TYPE.LOF, INSTRUMENT_TYPE.INDX,`
`70`		`- INSTRUMENT_TYPE.PUBLIC_FUND,`
	`70`	`+ INSTRUMENT_TYPE.PUBLIC_FUND, INSTRUMENT_TYPE.REITs`
`71`	`71`	`)`
`72`	`72`
`73`	`73`	`def __init__(self, path: str, custom_future_info: dict, args, *kwargs) -> None:`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ def account_type_str2enum(type_str):`
`136`	`136`	`INSTRUMENT_TYPE.ETF,`
`137`	`137`	`INSTRUMENT_TYPE.LOF,`
`138`	`138`	`INSTRUMENT_TYPE.INDX,`
`139`		`- INSTRUMENT_TYPE.PUBLIC_FUND`
	`139`	`+ INSTRUMENT_TYPE.PUBLIC_FUND,`
	`140`	`+ INSTRUMENT_TYPE.REITs`
`140`	`141`	`]`
`141`	`142`
`142`	`143`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@`
`84`	`84`	`'Programming Language :: Python :: 3.10',`
`85`	`85`	`'Programming Language :: Python :: 3.11',`
`86`	`86`	`'Programming Language :: Python :: 3.12',`
	`87`	`+ 'Programming Language :: Python :: 3.13',`
`87`	`88`	`],`
`88`	`89`	`python_requires=">=3.6"`
`89`	`90`	`)`