Merge pull request #495 from Alice39s/fix/js-license-metadata
fix: correct license metadata and Python packaging typo
This commit is contained in:
commit
a99989343e
|
|
@ -1,3 +1,11 @@
|
||||||
|
ip2region is dual-licensed under the Apache License 2.0 and the MIT License.
|
||||||
|
|
||||||
|
You may use, distribute, and modify this software under either license,
|
||||||
|
at your option. The full text of both licenses appears below.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
|
||||||
|
==============================================================================
|
||||||
Apache License
|
Apache License
|
||||||
Version 2.0, January 2004
|
Version 2.0, January 2004
|
||||||
http://www.apache.org/licenses/
|
http://www.apache.org/licenses/
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,20 @@
|
||||||
"ipv6-search"
|
"ipv6-search"
|
||||||
],
|
],
|
||||||
"author": "lionsoul2014",
|
"author": "lionsoul2014",
|
||||||
"license": "ISC",
|
"license": "Apache-2.0 OR MIT",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/lionsoul2014/ip2region/issues"
|
"url": "https://github.com/lionsoul2014/ip2region/issues"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/lionsoul2014/ip2region#readme",
|
"homepage": "https://github.com/lionsoul2014/ip2region#readme",
|
||||||
|
"files": [
|
||||||
|
"index.js",
|
||||||
|
"index.d.ts",
|
||||||
|
"searcher.js",
|
||||||
|
"util.js",
|
||||||
|
"README.md",
|
||||||
|
"README_zh.md",
|
||||||
|
"LICENSE.md"
|
||||||
|
],
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^30.0.0",
|
"@types/jest": "^30.0.0",
|
||||||
"argparse": "^2.0.1",
|
"argparse": "^2.0.1",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
include LICENSE
|
include LICENSE
|
||||||
include ReadMe.md
|
include README.md
|
||||||
include search_test.py
|
include search_test.py
|
||||||
include bench_test.py
|
include bench_test.py
|
||||||
recursive-include tests
|
recursive-include tests
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue