ODtools 2.1.20__tar.gz → 2.2.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/__init__.py +1 -1
  2. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/PKG-INFO +25 -6
  3. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/requires.txt +2 -5
  4. {ODtools-2.1.20 → odtools-2.2.0}/PKG-INFO +25 -6
  5. {ODtools-2.1.20 → odtools-2.2.0}/setup.py +7 -6
  6. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/bloom_filter_tools.py +0 -0
  7. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/excel_tools.py +0 -0
  8. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fastdfs_tools.py +0 -0
  9. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/__init__.py +0 -0
  10. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/client.py +0 -0
  11. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/connection.py +0 -0
  12. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/exceptions.py +0 -0
  13. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/fdfs_protol.py +0 -0
  14. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/fdfs_test.py +0 -0
  15. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/storage_client.py +0 -0
  16. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/tracker_client.py +0 -0
  17. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/fdfs_client/utils.py +0 -0
  18. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_client/THBaseService.py +0 -0
  19. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_client/__init__.py +0 -0
  20. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_client/constants.py +0 -0
  21. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_client/ttypes.py +0 -0
  22. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_tools.py +0 -0
  23. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/kafka_tools.py +0 -0
  24. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/log_tools.py +0 -0
  25. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/monitor_tools.py +0 -0
  26. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/monitor_tools_new.py +0 -0
  27. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/redis_tools.py +0 -0
  28. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/request_headers.py +0 -0
  29. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/save_data_class.py +0 -0
  30. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/__init__.py +0 -0
  31. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/connection.py +0 -0
  32. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/defaults.py +0 -0
  33. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/dupefilter.py +0 -0
  34. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/picklecompat.py +0 -0
  35. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/pipelines.py +0 -0
  36. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/queue.py +0 -0
  37. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/scheduler.py +0 -0
  38. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/spiders.py +0 -0
  39. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/scrapy_redis/utils.py +0 -0
  40. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/singleton_tools.py +0 -0
  41. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/time_counter.py +0 -0
  42. {ODtools-2.1.20 → odtools-2.2.0}/ODtools/timeit_counter.py +0 -0
  43. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/SOURCES.txt +0 -0
  44. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/dependency_links.txt +0 -0
  45. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/top_level.txt +0 -0
  46. {ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/zip-safe +0 -0
  47. {ODtools-2.1.20 → odtools-2.2.0}/README.md +0 -0
  48. {ODtools-2.1.20 → odtools-2.2.0}/setup.cfg +0 -0
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/__init__.py RENAMED
@@ -12,7 +12,7 @@ from ODtools.singleton_tools import Singleton
12
12
  from ODtools.time_counter import time_counter
13
13
  from ODtools.timeit_counter import timeit_counter
14
14
 
15
- __version__ = "2.1.20"
15
+ __version__ = "2.1.21"
16
16
  VERSION = tuple(map(int, __version__.split('.')))
17
17
 
18
18
  __all__ = [
{ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/PKG-INFO RENAMED
@@ -1,12 +1,11 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: ODtools
3
- Version: 2.1.20
3
+ Version: 2.2.0
4
4
  Summary: zkrTools
5
5
  Home-page: https://github.com/zkr-origin-data-dpt/ODtools
6
6
  Author: zkrPython
7
7
  Author-email: 178031608@qq.com
8
8
  License: Apache License
9
- Platform: UNKNOWN
10
9
  Classifier: Environment :: Web Environment
11
10
  Classifier: Intended Audience :: Developers
12
11
  Classifier: Operating System :: OS Independent
@@ -23,6 +22,26 @@ Classifier: Programming Language :: Python :: 3.6
23
22
  Classifier: Programming Language :: Python :: 3.7
24
23
  Classifier: Programming Language :: Python :: 3.8
25
24
  Classifier: Programming Language :: Python :: 3.9
26
-
27
- UNKNOWN
28
-
25
+ Classifier: Programming Language :: Python :: 3.10
26
+ Classifier: Programming Language :: Python :: 3.11
27
+ Classifier: Programming Language :: Python :: 3.12
28
+ Classifier: Programming Language :: Python :: 3.13
29
+ Requires-Dist: xlrd
30
+ Requires-Dist: xlwt
31
+ Requires-Dist: elasticsearch==8.2.0
32
+ Requires-Dist: thrift
33
+ Requires-Dist: kafka-python
34
+ Requires-Dist: redis-py-cluster
35
+ Requires-Dist: pymysql
36
+ Requires-Dist: loguru
37
+ Requires-Dist: colorlog
38
+ Requires-Dist: aiohttp-socks
39
+ Requires-Dist: apscheduler
40
+ Requires-Dist: PySocks
41
+ Dynamic: author
42
+ Dynamic: author-email
43
+ Dynamic: classifier
44
+ Dynamic: home-page
45
+ Dynamic: license
46
+ Dynamic: requires-dist
47
+ Dynamic: summary
{ODtools-2.1.20 → odtools-2.2.0}/ODtools.egg-info/requires.txt RENAMED
@@ -1,15 +1,12 @@
1
1
  xlrd
2
2
  xlwt
3
- redis
4
- elasticsearch==6.1.1
3
+ elasticsearch==8.2.0
5
4
  thrift
6
5
  kafka-python
7
6
  redis-py-cluster
8
7
  pymysql
9
8
  loguru
10
9
  colorlog
11
- aiohttp==3.1.3
12
- aiosocksy==0.1.2
10
+ aiohttp-socks
13
11
  apscheduler
14
- requests
15
12
  PySocks
{ODtools-2.1.20 → odtools-2.2.0}/PKG-INFO RENAMED
@@ -1,12 +1,11 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: ODtools
3
- Version: 2.1.20
3
+ Version: 2.2.0
4
4
  Summary: zkrTools
5
5
  Home-page: https://github.com/zkr-origin-data-dpt/ODtools
6
6
  Author: zkrPython
7
7
  Author-email: 178031608@qq.com
8
8
  License: Apache License
9
- Platform: UNKNOWN
10
9
  Classifier: Environment :: Web Environment
11
10
  Classifier: Intended Audience :: Developers
12
11
  Classifier: Operating System :: OS Independent
@@ -23,6 +22,26 @@ Classifier: Programming Language :: Python :: 3.6
23
22
  Classifier: Programming Language :: Python :: 3.7
24
23
  Classifier: Programming Language :: Python :: 3.8
25
24
  Classifier: Programming Language :: Python :: 3.9
26
-
27
- UNKNOWN
28
-
25
+ Classifier: Programming Language :: Python :: 3.10
26
+ Classifier: Programming Language :: Python :: 3.11
27
+ Classifier: Programming Language :: Python :: 3.12
28
+ Classifier: Programming Language :: Python :: 3.13
29
+ Requires-Dist: xlrd
30
+ Requires-Dist: xlwt
31
+ Requires-Dist: elasticsearch==8.2.0
32
+ Requires-Dist: thrift
33
+ Requires-Dist: kafka-python
34
+ Requires-Dist: redis-py-cluster
35
+ Requires-Dist: pymysql
36
+ Requires-Dist: loguru
37
+ Requires-Dist: colorlog
38
+ Requires-Dist: aiohttp-socks
39
+ Requires-Dist: apscheduler
40
+ Requires-Dist: PySocks
41
+ Dynamic: author
42
+ Dynamic: author-email
43
+ Dynamic: classifier
44
+ Dynamic: home-page
45
+ Dynamic: license
46
+ Dynamic: requires-dist
47
+ Dynamic: summary
{ODtools-2.1.20 → odtools-2.2.0}/setup.py RENAMED
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name="ODtools",
5
- version="2.1.20",
5
+ version="2.2.0",
6
6
  author="zkrPython",
7
7
  author_email="178031608@qq.com",
8
8
  description="zkrTools",
@@ -15,18 +15,15 @@ setup(
15
15
  install_requires=[
16
16
  "xlrd",
17
17
  "xlwt",
18
- "redis",
19
- "elasticsearch==6.1.1",
18
+ "elasticsearch==8.2.0",
20
19
  "thrift",
21
20
  "kafka-python",
22
21
  "redis-py-cluster",
23
22
  "pymysql",
24
23
  "loguru",
25
24
  "colorlog",
26
- "aiohttp==3.1.3",
27
- "aiosocksy==0.1.2",
25
+ "aiohttp-socks",
28
26
  "apscheduler",
29
- "requests",
30
27
  "PySocks",#增加依赖，requests socket 代理依赖
31
28
  ],
32
29
  classifiers=[
@@ -46,5 +43,9 @@ setup(
46
43
  'Programming Language :: Python :: 3.7',
47
44
  'Programming Language :: Python :: 3.8',
48
45
  'Programming Language :: Python :: 3.9',
46
+ 'Programming Language :: Python :: 3.10',
47
+ 'Programming Language :: Python :: 3.11',
48
+ 'Programming Language :: Python :: 3.12',
49
+ 'Programming Language :: Python :: 3.13',
49
50
  ],
50
51
  )
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/excel_tools.py RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/hbase_tools.py RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/kafka_tools.py RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/log_tools.py RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/ODtools/redis_tools.py RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/README.md RENAMED
File without changes
{ODtools-2.1.20 → odtools-2.2.0}/setup.cfg RENAMED
File without changes