Merge pull request #1838 from rubikplanet/master

1. setup中放开3.10。 2. requirements.txt中移除demjosn，安装不兼容问题。 3. fix: panda…

QUANTAXIS/QAData/data_resample.py

@@ -690,22 +690,22 @@ def QA_data_futuremin_resample(
             type_,
             offset="0min",
             closed='right',
-            loffset=type_
         ).apply(CONVERSION)
+        part_1_res.index = part_1_res.index + to_offset(type_)
         part_2 = min_data.iloc[idx.indexer_between_time('13:30', '15:00')]
         part_2_res = part_2.resample(
             type_,
             offset="30min",
             closed='right',
-            loffset=type_
         ).agg(CONVERSION)
+        part_2_res.index = part_2_res.index + to_offset(type_)
         part_3 = min_data.iloc[idx.indexer_between_time('21:00', '23:59')]
         part_3_res = part_3.resample(
             type_,
             offset="0min",
             closed='right',
-            loffset=type_
         ).agg(CONVERSION)
+        part_3_res.index = part_3_res.index + to_offset(type_)
         return pd.concat(
             [part_1_res,
              part_2_res,

requirements.txt

@@ -15,7 +15,6 @@ retrying
 seaborn>=0.11.1
 attrs>=17.4.0
 pyconvert>=0.6.3
-demjson>=2.2.4
 janus==0.4.0
 pyecharts_snapshot
 async_timeout

setup.py

@@ -37,8 +37,8 @@
 """
 """
 
-if sys.version_info.major != 3 or sys.version_info.minor not in [5, 6, 7, 8, 9]:
-    print('wrong version, should be 3.5/3.6/3.7/3.8 version')
+if sys.version_info.major != 3 or sys.version_info.minor not in [5, 6, 7, 8, 9, 10]:
+    print('wrong version, should be 3.5/3.6/3.7/3.8/3.9 version')
     sys.exit()
 
 with io.open('QUANTAXIS/__init__.py', 'rt', encoding='utf8') as f: