Merge branch 'main' into main

Author: vnpy

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.6版本
+
+1. 使用zoneinfo替换pytz库
+2. 调整安装脚本setup.cfg，添加Python版本限制
+
 # 1.0.5版本
 
 1. 将模块的图标文件信息，改为完整路径字符串

README.md

@@ -5,7 +5,7 @@
 </p>
 
 <p align="center">
-    <img src ="https://img.shields.io/badge/version-1.0.5-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/version-1.0.6-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/platform-windows|linux|macos-yellow.svg"/>
     <img src ="https://img.shields.io/badge/python-3.7|3.8|3.9|3.10-blue.svg" />
     <img src ="https://img.shields.io/github/license/vnpy/vnpy.svg?color=orange"/>
@@ -17,7 +17,7 @@
 
 ## 安装
 
-安装环境推荐基于3.0.0版本以上的【[**VeighNa Studio**](https://www.vnpy.com)】。
+安装环境推荐基于3.3.0版本以上的【[**VeighNa Studio**](https://www.vnpy.com)】。
 
 直接使用pip命令：
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vnpy_datamanager
-version = 1.0.5
+version = 1.0.6
 url = https://www.vnpy.com
 license = MIT
 author = Xiaoyou Chen
@@ -30,6 +30,7 @@ classifiers =
 [options]
 packages = find:
 zip_safe = False
+python_requires = >=3.7
 
 [options.package_data]
 * = *.ico

vnpy_datamanager/engine.py

@@ -2,14 +2,12 @@
 from datetime import datetime
 from typing import List, Optional
 
-from pytz import timezone
-
 from vnpy.trader.engine import BaseEngine, MainEngine, EventEngine
 from vnpy.trader.constant import Interval, Exchange
 from vnpy.trader.object import BarData, TickData, ContractData, HistoryRequest
 from vnpy.trader.database import BaseDatabase, get_database, BarOverview, DB_TZ
 from vnpy.trader.datafeed import BaseDatafeed, get_datafeed
-
+from vnpy.trader.utility import ZoneInfo
 
 APP_NAME = "DataManager"
 
@@ -54,14 +52,14 @@ def import_data_from_csv(
         bars: List[BarData] = []
         start: datetime = None
         count: int = 0
-        tz = timezone(tz_name)
+        tz = ZoneInfo(tz_name)
 
         for item in reader:
             if datetime_format:
                 dt: datetime = datetime.strptime(item[datetime_head], datetime_format)
             else:
                 dt: datetime = datetime.fromisoformat(item[datetime_head])
-            dt: datetime = tz.localize(dt)
+            dt = dt.replace(tzinfo=tz)
 
             turnover = item.get(turnover_head, 0)
             open_interest = item.get(open_interest_head, 0)

vnpy_datamanager/ui/widget.py

@@ -2,13 +2,12 @@
 from functools import partial
 from datetime import datetime, timedelta
 
-from pytz import all_timezones
-
 from vnpy.trader.ui import QtWidgets, QtCore
 from vnpy.trader.engine import MainEngine, EventEngine
 from vnpy.trader.constant import Interval, Exchange
 from vnpy.trader.object import BarData
 from vnpy.trader.database import DB_TZ
+from vnpy.trader.utility import available_timezones
 
 from ..engine import APP_NAME, ManagerEngine, BarOverview
 
@@ -487,7 +486,7 @@ def __init__(self, parent=None) -> None:
                 self.interval_combo.addItem(str(i.name), i)
 
         self.tz_combo: QtWidgets.QComboBox = QtWidgets.QComboBox()
-        self.tz_combo.addItems(all_timezones)
+        self.tz_combo.addItems(available_timezones())
         self.tz_combo.setCurrentIndex(self.tz_combo.findText("Asia/Shanghai"))
 
         self.datetime_edit: QtWidgets.QLineEdit = QtWidgets.QLineEdit("datetime")
@@ -602,7 +601,7 @@ def download(self) -> None:
 
         start_date = self.start_date_edit.date()
         start: datetime = datetime(start_date.year(), start_date.month(), start_date.day())
-        start: datetime = DB_TZ.localize(start)
+        start: datetime = start.replace(tzinfo=DB_TZ)
 
         if interval == Interval.TICK:
             count: int = self.engine.download_tick_data(symbol, exchange, start)