From e4cf9e1534c3f0608a626c999fb84875d5881573 Mon Sep 17 00:00:00 2001 From: guanjihuan Date: Thu, 2 Nov 2023 03:53:47 +0800 Subject: [PATCH] 0.1.12 --- API_Reference/API_Reference.py | 2 +- Source_Code/PyPI/setup.cfg | 2 +- Source_Code/PyPI/src/guan.egg-info/PKG-INFO | 2 +- Source_Code/PyPI/src/guan/__init__.py | 13 +++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/API_Reference/API_Reference.py b/API_Reference/API_Reference.py index 89ea9bb..ca69dd7 100644 --- a/API_Reference/API_Reference.py +++ b/API_Reference/API_Reference.py @@ -1,4 +1,4 @@ -# API Reference shows all functions in Guan package. The current version is guan-0.1.11 updated on November 02, 2023. +# API Reference shows all functions in Guan package. The current version is guan-0.1.12 updated on November 02, 2023. import guan diff --git a/Source_Code/PyPI/setup.cfg b/Source_Code/PyPI/setup.cfg index 030d9be..a4a91f3 100644 --- a/Source_Code/PyPI/setup.cfg +++ b/Source_Code/PyPI/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = guan -version = 0.1.11 +version = 0.1.12 author = guanjihuan author_email = guanjihuan@163.com description = An open source python package diff --git a/Source_Code/PyPI/src/guan.egg-info/PKG-INFO b/Source_Code/PyPI/src/guan.egg-info/PKG-INFO index 942ec98..138a58c 100644 --- a/Source_Code/PyPI/src/guan.egg-info/PKG-INFO +++ b/Source_Code/PyPI/src/guan.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: guan -Version: 0.1.11 +Version: 0.1.12 Summary: An open source python package Home-page: https://py.guanjihuan.com Author: guanjihuan diff --git a/Source_Code/PyPI/src/guan/__init__.py b/Source_Code/PyPI/src/guan/__init__.py index abbdf28..11e2dee 100644 --- a/Source_Code/PyPI/src/guan/__init__.py +++ b/Source_Code/PyPI/src/guan/__init__.py @@ -1,6 +1,6 @@ # Guan is an open-source python package developed and maintained by https://www.guanjihuan.com/about (Ji-Huan Guan, 关济寰). The primary location of this package is on website https://py.guanjihuan.com. GitHub link: https://github.com/guanjihuan/py.guanjihuan.com. -# The current version is guan-0.1.11, updated on November 02, 2023. +# The current version is guan-0.1.12, updated on November 02, 2023. # Installation: pip install --upgrade guan @@ -4901,13 +4901,13 @@ def get_mac_address(): # Guan软件包的使用统计（不涉及到用户的个人数据） def statistics_of_guan_package(): try: - import socket import guan message_calling = guan.get_calling_function_name(layer=3) - current_version = get_current_version('guan') if message_calling == '': + import socket datetime_date = guan.get_date() datetime_time = guan.get_time() + current_version = guan.get_current_version('guan') client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) client_socket.settimeout(0.5) client_socket.connect(('py.guanjihuan.com', 12345)) @@ -4918,7 +4918,7 @@ def statistics_of_guan_package(): client_socket2 = socket.socket(socket.AF_INET, socket.SOCK_STREAM) client_socket2.settimeout(0.5) client_socket2.connect(('py.guanjihuan.com', 12345)) - mac_address = get_mac_address() + mac_address = guan.get_mac_address() send_mac_address = 'version_'+current_version+' MAC_address: '+mac_address+'\n' client_socket2.send(send_mac_address.encode()) client_socket2.close() @@ -4952,8 +4952,9 @@ def get_current_version(package_name='guan'): # Guan软件包升级提示 def notification_of_upgrade(): try: - latest_version = get_latest_version(package_name='guan', timeout=2) - current_version = get_current_version('guan') + import guan + latest_version = guan.get_latest_version(package_name='guan', timeout=2) + current_version = guan.get_current_version('guan') if latest_version != None and current_version != None: if latest_version != current_version: print('提示：您当前使用的版本是 guan-'+current_version+'，目前已经有最新版本 guan-'+latest_version+'。您可以通过以下命令对软件包进行升级：pip install --upgrade guan')