From 9b34ae4a26bf4194188a9103897b3921cc459a24 Mon Sep 17 00:00:00 2001 From: PadishahIII <350717997@qq.com> Date: Mon, 29 Apr 2024 16:12:57 +0800 Subject: [PATCH] 1.3.7 Not solved: compatible issue with python3.8 --- .github/workflows/main.yml | 2 +- DevelopJournal.md | 3 ++- README.md | 1 + poetry.lock | 12 +++++----- pyproject.toml | 2 +- requirements.txt | 46 +++++++++++++++++++------------------- tox.ini | 2 +- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b953fc..5ca75ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] - python: [ "3.8","3.9","3.10", "3.11","3.12" ] + python: [ "3.9","3.10", "3.11","3.12" ] steps: diff --git a/DevelopJournal.md b/DevelopJournal.md index e8c3288..f7d3003 100644 --- a/DevelopJournal.md +++ b/DevelopJournal.md @@ -1,6 +1,7 @@ # 2024.4.29 - [ ] Support 3.8~3.11 -- [ ] Add more CLI tests + - Current support 3.9~3.11 +- [x] Add more CLI tests - test_facade - test_local_scan # 2024.4.28 diff --git a/README.md b/README.md index faa41f7..a3d8843 100644 --- a/README.md +++ b/README.md @@ -211,6 +211,7 @@ rules: # Change Log ## 2024.4.29 Version 1.3.7 - Test on multiple python versions +- Support python 3.9~3.11 ## 2024.4.29 Version 1.3.6 - Repackage diff --git a/poetry.lock b/poetry.lock index 3f5fbf1..bf04831 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1212,13 +1212,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "pre-commit" -version = "3.5.0" +version = "3.7.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"}, - {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"}, + {file = "pre_commit-3.7.0-py2.py3-none-any.whl", hash = "sha256:5eae9e10c2b5ac51577c3452ec0a490455c45a0533f7960f993a0d01e59decab"}, + {file = "pre_commit-3.7.0.tar.gz", hash = "sha256:e209d61b8acdcf742404408531f0c37d49d2c734fd7cff2d6076083d191cb060"}, ] [package.dependencies] @@ -1931,5 +1931,5 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" -python-versions = ">=3.8,<4.0" -content-hash = "c433b524c94997f2e4969d08462b6d5ad1069aac51dd8b815206f15ea7e915e0" +python-versions = ">=3.9,<4.0" +content-hash = "7a5218960c99326a2d1c48bf56943025c293dfb0092fc61048087ad80a7bf027" diff --git a/pyproject.toml b/pyproject.toml index 9f6e7d3..be82637 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = ">=3.8,<4.0" +python = ">=3.9,<4.0" dynaconf = "^3.1.12" click = "^8.1.3" hyperscan = [ diff --git a/requirements.txt b/requirements.txt index 31a395c..b9c8e57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.5 ; python_version >= "3.8" and python_version < "4.0" \ +aiohttp==3.9.5 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0605cc2c0088fcaae79f01c913a38611ad09ba68ff482402d3410bf59039bfb8 \ --hash=sha256:0a158704edf0abcac8ac371fbb54044f3270bdbc93e254a82b6c82be1ef08f3c \ --hash=sha256:0cbf56238f4bbf49dab8c2dc2e6b1b68502b1e88d335bea59b3f5b9f4c001475 \ @@ -75,40 +75,40 @@ aiohttp==3.9.5 ; python_version >= "3.8" and python_version < "4.0" \ --hash=sha256:f64fd07515dad67f24b6ea4a66ae2876c01031de91c93075b8093f07c0a2d93d \ --hash=sha256:fcde4c397f673fdec23e6b05ebf8d4751314fa7c24f93334bf1f1364c1c69ac7 \ --hash=sha256:ff84aeb864e0fac81f676be9f4685f0527b660f1efdc40dcede3c251ef1e867f -aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "4.0" \ +aiosignal==1.3.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc \ --hash=sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17 -anyio==4.3.0 ; python_version >= "3.8" and python_version < "4.0" \ +anyio==4.3.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \ --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6 -async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.11" \ +async-timeout==4.0.3 ; python_version >= "3.9" and python_version < "3.11" \ --hash=sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f \ --hash=sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028 -attrs==23.2.0 ; python_version >= "3.8" and python_version < "4.0" \ +attrs==23.2.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \ --hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1 -beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "4.0" \ +beautifulsoup4==4.12.3 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051 \ --hash=sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed -bs4==0.0.2 ; python_version >= "3.8" and python_version < "4.0" \ +bs4==0.0.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:a48685c58f50fe127722417bae83fe6badf500d54b55f7e39ffe43b798653925 \ --hash=sha256:abf8742c0805ef7f662dce4b51cca104cffe52b835238afc169142ab9b3fbccc -certifi==2024.2.2 ; python_version >= "3.8" and python_version < "4.0" \ +certifi==2024.2.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1 -click==8.1.7 ; python_version >= "3.8" and python_version < "4.0" \ +click==8.1.7 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de -colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" \ +colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" and platform_system == "Windows" \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 -dynaconf==3.2.5 ; python_version >= "3.8" and python_version < "4.0" \ +dynaconf==3.2.5 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:12202fc26546851c05d4194c80bee00197e7c2febcb026e502b0863be9cbbdd8 \ --hash=sha256:42c8d936b32332c4b84e4d4df6dd1626b6ef59c5a94eb60c10cd3c59d6b882f2 -exceptiongroup==1.2.1 ; python_version >= "3.8" and python_version < "3.11" \ +exceptiongroup==1.2.1 ; python_version >= "3.9" and python_version < "3.11" \ --hash=sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad \ --hash=sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16 -frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "4.0" \ +frozenlist==1.4.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:04ced3e6a46b4cfffe20f9ae482818e34eba9b5fb0ce4056e4cc9b6e212d09b7 \ --hash=sha256:0633c8d5337cb5c77acbccc6357ac49a1770b8c487e5b3505c57b949b4b82e98 \ --hash=sha256:068b63f23b17df8569b7fdca5517edef76171cf3897eb68beb01341131fbd2ad \ @@ -186,13 +186,13 @@ frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "4.0" \ --hash=sha256:fbeb989b5cc29e8daf7f976b421c220f1b8c731cbf22b9130d8815418ea45887 \ --hash=sha256:fde5bd59ab5357e3853313127f4d3565fc7dad314a74d7b5d43c22c6a5ed2ced \ --hash=sha256:fe1a06da377e3a1062ae5fe0926e12b84eceb8a50b350ddca72dc85015873f74 -h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" \ +h11==0.14.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \ --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761 -httpcore==1.0.5 ; python_version >= "3.8" and python_version < "4.0" \ +httpcore==1.0.5 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \ --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5 -httpx[socks]==0.27.0 ; python_version >= "3.8" and python_version < "4.0" \ +httpx[socks]==0.27.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \ --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5 hyperscan==0.7.7 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux") \ @@ -223,10 +223,10 @@ hyperscan==0.7.7 ; python_version >= "3.10" and python_version < "4.0" and (sys_ --hash=sha256:ec193cf30465cd14ea3896fd9d8a7031a4a25fc980bf45ca1d5fd95cccd96755 \ --hash=sha256:f7559b4bf144e10b9f279326ec456ad2dfa92013d8923f57777491d89860c0f9 \ --hash=sha256:f94255ef55adbb3e1bc1bb6c8b42efe307ec2eb9ca8e22953008f89ca9520d72 -idna==3.7 ; python_version >= "3.8" and python_version < "4.0" \ +idna==3.7 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 -multidict==6.0.5 ; python_version >= "3.8" and python_version < "4.0" \ +multidict==6.0.5 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556 \ --hash=sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c \ --hash=sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29 \ @@ -317,19 +317,19 @@ multidict==6.0.5 ; python_version >= "3.8" and python_version < "4.0" \ --hash=sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24 \ --hash=sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423 \ --hash=sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef -sniffio==1.3.1 ; python_version >= "3.8" and python_version < "4.0" \ +sniffio==1.3.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \ --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc -socksio==1.0.0 ; python_version >= "3.8" and python_version < "4.0" \ +socksio==1.0.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:95dc1f15f9b34e8d7b16f06d74b8ccf48f609af32ab33c608d08761c5dcbb1f3 \ --hash=sha256:f88beb3da5b5c38b9890469de67d0cb0f9d494b78b106ca1845f96c10b91c4ac -soupsieve==2.5 ; python_version >= "3.8" and python_version < "4.0" \ +soupsieve==2.5 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 \ --hash=sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7 -typing-extensions==4.11.0 ; python_version >= "3.8" and python_version < "3.11" \ +typing-extensions==4.11.0 ; python_version >= "3.9" and python_version < "3.11" \ --hash=sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0 \ --hash=sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a -yarl==1.9.4 ; python_version >= "3.8" and python_version < "4.0" \ +yarl==1.9.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51 \ --hash=sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce \ --hash=sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559 \ diff --git a/tox.ini b/tox.ini index b46153c..232a0cb 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = py311 py310 py39 - py38 +; py38 ; isort ; pylint