From b311480e2a60e420abcaf8e69143477d1bcf3d98 Mon Sep 17 00:00:00 2001 From: JrD <421273918@qq.com> Date: Sat, 29 Aug 2020 01:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pipfile | 3 +-- Pipfile.lock | 67 ++++++------------------------------------------ requirements.txt | 27 ++++++++----------- 3 files changed, 19 insertions(+), 78 deletions(-) diff --git a/Pipfile b/Pipfile index 490f42b..5762b8a 100644 --- a/Pipfile +++ b/Pipfile @@ -8,16 +8,15 @@ verify_ssl = true [packages] tqdm = "*" loguru = "*" +sqlalchemy = "*" dnspython = "*" requests = "*" -records = "*" tldextract = "*" exrex = "*" fire = "*" bs4 = "*" pysocks = "*" cloudscraper = "*" -tablib = "*" tenacity = "*" treelib = "*" diff --git a/Pipfile.lock b/Pipfile.lock index ad71cf1..cb420ac 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fde2c88929fdf63725faea24a4fc7d82d6792caaca6676c08e96a40227f47e18" + "sha256": "ec334d232f2f026790f6b7eb224f4045d5003a30e27d5a751d0b547c226a8bfe" }, "pipfile-spec": 6, "requires": { @@ -53,14 +53,6 @@ "index": "pypi", "version": "==1.2.46" }, - "colorama": { - "hashes": [ - "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff", - "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1" - ], - "markers": "sys_platform == 'win32'", - "version": "==0.4.3" - }, "dnspython": { "hashes": [ "sha256:044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7", @@ -69,18 +61,6 @@ "index": "pypi", "version": "==2.0.0" }, - "docopt": { - "hashes": [ - "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" - ], - "version": "==0.6.2" - }, - "et-xmlfile": { - "hashes": [ - "sha256:614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" - ], - "version": "==1.0.1" - }, "exrex": { "hashes": [ "sha256:3fb8b18fd9832eaff8b13dc042a4f63b13c5d684ee069f70a23ddfc6bcb708f3" @@ -99,6 +79,7 @@ "hashes": [ "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.18.2" }, "idna": { @@ -106,15 +87,9 @@ "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.10" }, - "jdcal": { - "hashes": [ - "sha256:1abf1305fce18b4e8aa248cf8fe0c56ce2032392bc64bbd61b5dff2a19ec8bba", - "sha256:472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" - ], - "version": "==1.4.1" - }, "loguru": { "hashes": [ "sha256:70201d5fce26da89b7a5f168caa2bb674e06b969829f56737db1d6472e53e7c3", @@ -123,17 +98,12 @@ "index": "pypi", "version": "==0.5.1" }, - "openpyxl": { - "hashes": [ - "sha256:626d38647c063d55803ef4971c4d43226538d4e95cb6260c094e363ee33e10c7" - ], - "version": "==2.4.11" - }, "pyparsing": { "hashes": [ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pysocks": { @@ -145,14 +115,6 @@ "index": "pypi", "version": "==1.7.1" }, - "records": { - "hashes": [ - "sha256:47e4874096f4a8f4b5bcad8c7c7cf512be36186e6e263ff3dfd750b05ff0d3c4", - "sha256:cdbacf52c61b4a3bc10fef1286a24a63ae95255a2e7b4e8ccb1e1f96737231ed" - ], - "index": "pypi", - "version": "==0.5.3" - }, "requests": { "hashes": [ "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b", @@ -180,6 +142,7 @@ "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.15.0" }, "soupsieve": { @@ -187,6 +150,7 @@ "sha256:1634eea42ab371d3d346309b93df7870a88610f0725d47528be902a0d95ecc55", "sha256:a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" ], + "markers": "python_version >= '3.5'", "version": "==2.0.1" }, "sqlalchemy": { @@ -224,16 +188,8 @@ "sha256:f2e8a9c0c8813a468aa659a01af6592f71cd30237ec27c4cc0683f089f90dcfc", "sha256:fe7fe11019fc3e6600819775a7d55abc5446dda07e9795f5954fdbf8a49e1c37" ], - "markers": "python_version >= '3.0'", - "version": "==1.3.19" - }, - "tablib": { - "hashes": [ - "sha256:8cc2fa10bc37219ac5e76850eb7fbd50de313c7a1a7895c44af2a8dd206b7be7", - "sha256:c5a77c96ad306d5b380def1309d521ad5e98b4f83726f84857ad87e142d13279" - ], "index": "pypi", - "version": "==2.0.0" + "version": "==1.3.19" }, "tenacity": { "hashes": [ @@ -277,15 +233,8 @@ "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a", "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.25.10" - }, - "win32-setctime": { - "hashes": [ - "sha256:568fd636c68350bcc54755213fe01966fe0a6c90b386c0776425944a0382abef", - "sha256:b47e5023ec7f0b4962950902b15bc56464a380d869f59d27dbf9ab423b23e8f9" - ], - "markers": "sys_platform == 'win32'", - "version": "==1.0.1" } }, "develop": {} diff --git a/requirements.txt b/requirements.txt index c9c188e..3ad5da7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,26 @@ +-i https://mirrors.aliyun.com/pypi/simple/ beautifulsoup4==4.9.1 bs4==0.0.1 certifi==2020.6.20 chardet==3.0.4 cloudscraper==1.2.46 -colorama==0.4.3 dnspython==2.0.0 -docopt==0.6.2 -et-xmlfile==1.0.1 exrex==0.10.5 fire==0.3.1 -future==0.18.2 -idna==2.10 -jdcal==1.4.1 +future==0.18.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' +idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' loguru==0.5.1 -openpyxl==2.4.11 -pyparsing==2.4.7 -PySocks==1.7.1 -records==0.5.3 -requests==2.24.0 +pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' +pysocks==1.7.1 requests-file==1.5.1 requests-toolbelt==0.9.1 -six==1.15.0 -soupsieve==2.0.1 -SQLAlchemy==1.3.19 -tablib==2.0.0 +requests==2.24.0 +six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +soupsieve==2.0.1; python_version >= '3.5' +sqlalchemy==1.3.19 tenacity==6.2.0 termcolor==1.1.0 tldextract==2.2.3 tqdm==4.48.2 treelib==1.6.1 -urllib3==1.25.10 -win32-setctime==1.0.1 \ No newline at end of file +urllib3==1.25.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'