Skip to content
This repository was archived by the owner on Feb 3, 2024. It is now read-only.

Commit d797006

Browse files
mboot-githubmboot-github
committed
update version and readme
1 parent 1eb9a45 commit d797006

File tree

10 files changed

+131
-129
lines changed

10 files changed

+131
-129
lines changed

‎Makefile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
all: reformat test build testwhl
3+
all: reformat version build testwhl test_upload_pypi
44

55
reformat:
66
./reformat-code.sh
@@ -9,8 +9,22 @@ test:
99
./test2.py -t 2>2 | tee 1
1010

1111
build:
12+
rm -rf dist
1213
python -m build
13-
tar tvf dist/*.tar.gz
14+
tar tvf dist/whois-$$( cat ./work/version ).tar.gz
1415

1516
testwhl:
1617
./testwhl.sh 2>2 | tee 1
18+
19+
version:
20+
mkdir -p work
21+
grep VERSION ./whois/version.py | awk '{ gsub(/"/, ""); print $$NF }' >./work/version
22+
cat ./work/version
23+
24+
test_upload_pypi:
25+
ls -l ./dist/*$$( cat ./work/version )*
26+
twine upload -r testpypi dist/whois-$$( cat ./work/version ).tar.gz dist/whois-$$( cat ./work/version )-py3-*.whl
27+
28+
upload_pypi:
29+
ls -l ./dist/*$$( cat ./work/version )*
30+
twine upload -r pypi dist/whois-$$( cat ./work/version ).tar.gz dist/whois-$$( cat ./work/version )-py3-*.whl

DONE renamed to Old/DONE

File renamed without changes.

‎Old/TODO‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1-
TODO
1+
investigate why adding utf8 based domains creates:
2+
3+
UnknownTld meta.xn--11b4c The TLD xn--11b4c is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
4+
UnknownTld meta.xn--11b5bs3a The TLD xn--11b5bs3a is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
5+
UnknownTld meta.xn--2scrj The TLD xn--2scrj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
6+
UnknownTld meta.xn--31bsy5d The TLD xn--31bsy5d is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
7+
UnknownTld meta.xn--3hcrj The TLD xn--3hcrj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
8+
UnknownTld meta.xn--45br5r The TLD xn--45br5r is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
9+
UnknownTld meta.xn--45brj The TLD xn--45brj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
10+
UnknownTld meta.xn--c2br The TLD xn--c2br is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
11+
UnknownTld meta.xn--clchc0ea0b The TLD xn--clchc0ea0b is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
12+
UnknownTld meta.xn--fpcrj The TLD xn--fpcrj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
13+
UnknownTld meta.xn--gecrj The TLD xn--gecrj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
14+
UnknownTld meta.xn--h2breg The TLD xn--h2breg is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
15+
UnknownTld meta.xn--h2brj The TLD xn--h2brj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
16+
UnknownTld meta.xn--hlcj6aya The TLD xn--hlcj6aya is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
17+
UnknownTld meta.xn--qwcrj The TLD xn--qwcrj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
18+
UnknownTld meta.xn--s9brj The TLD xn--s9brj is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
19+
UnknownTld meta.xn--xkc2dl3a The TLD xn--xkc2dl3a is currently not supported by this package. Use validTlds() to see what toplevel domains are supported.
220

3-
# pt is difficult it often gives no data, it works in aws frankfurt though
4-
ERROR: output; missing nameserver 'ns1.dnscpanel.com.' for tld: pt
5-
ERROR: output; missing nameserver 'ns2.dnscpanel.com.' for tld: pt

setup.py renamed to Old/setup.py

File renamed without changes.

‎README.md‎

Lines changed: 7 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,20 @@
1-
# whoisdomain
1+
# github:python-whois
2+
# pypi: whois
23

34
* A Python package for retrieving WHOIS information of DOMAIN'S ONLY.
4-
* Python 2.x IS NOT supported.
5-
* Currently no additional python packages need to be installed.
65

7-
---
6+
For all further info:
87

9-
## Notes
10-
11-
* This package will not support querying ip CIDR ranges or AS information
12-
* This was a copy of the original DanyCork 'whois'.
13-
* Significantly refactored in 2023.
14-
* The output is still compatible with DanyCork 'whois'
15-
16-
## Versioning
17-
18-
* I will start versioning at 1.x.x
19-
* the second item will be YYYYMMDD,
20-
* the third item will start from 1 and be only used if more than one update will have to be done in one day.
21-
22-
Versions `1.x.x` will keep the output compatible with Danny Cork until 2024-02-03 (February 2024)
23-
24-
## Releases
25-
26-
* Releases are avalable at: [Pypi](https://pypi.org/project/whoisdomain/)
27-
28-
Pypi releases can be installed with:
29-
30-
* `pip install whoisdomain`
31-
32-
## Features
33-
* See: [Features](docs/Features.md)
34-
35-
## Dependencies
36-
* please install also the command line "whois" of your distribution as this library parses the output of the "whois" cli command of your operating system
8+
* see [WhoisDomain](https://github.com/mboot-github/WhoisDomain)
9+
* all future development will take place on WhoisDomain
3710

3811
### Notes for Mac users
3912
* it has been observed that the default cli whois on Mac is showing each forward step in its output, this makes parsing the result very unreliable.
4013
* using a brew install whois will give in general better results.
4114

42-
## Docker release
43-
* See [Docker](docs/Docker.md)
44-
45-
## Usage example
46-
* See [Usage](docs/Usage.md)
47-
48-
## whoisdomain
49-
* the cli `whoisdomain` is documented in [whoisdomain-cli](docs/whoisdomain-cli.md)
50-
51-
## ccTLD & TLD support
52-
53-
Most `tld's` are now autodetected via IANA root db, see the Analizer directory
54-
and `make suggest`.
55-
56-
* see the file: [tld_regexpr](./whoisdomain/tldDb/tld_regexpr.py)
57-
* for python use: `whoisdomain.validTlds()`
58-
* for cli use `whoisdomain -S`
59-
60-
---
61-
6215
## Support
63-
* Python 3.x is supported for x >= 9
6416
* Python 2.x IS NOT supported.
65-
66-
## Author's
67-
* See: [Authors](docs/Authors.md)
68-
69-
---
17+
* Python 3.x is supported for x >= 9
7018

7119
## Updates
72-
* see [Updates](docs/Updates.md) for a full history of changes.
73-
* Only the latest update is mentioned here
74-
75-
### 1.20230906.1
76-
* introduce parsing based on functions
77-
* allow contextual search in splitted data and plain data
78-
* allow contextual search based on earlier result
79-
* fix a few tld to return the proper registrant string (not nic handle)
80-
81-
### 1.20230913.1
82-
* if you have installed `tld` (pip install tld) you can enable withPublicSuffix=True to process untill you reach the pseudo tld.
83-
* the public_suffix info is added if available (and if requested)
84-
* example case is: ./test2.py -d www.dublin.airport.aero --withPublicSuffix
85-
86-
### 1.20230913.3
87-
* fix re.NOFLAGS, it is not compatible with 3.9, it appears in 3.11
88-
89-
## 1.20230917.1
90-
* prepare work on pylint
91-
* switch to logging: all verbose is currently log.debug(); to show set LOGLEVEL=DEBUG before calling, see Makefile: make test
92-
* experimental: add extractServers: bool default False; when true we will try to extract the "redirect info chain" on rcf1036/whois and jwhois for linux/darwin
93-
* add missing option to query(), test in production environment done
94-
95-
## 1.20231102.1
96-
* fix from kazet for .pl tld.
97-
98-
## 1.20231115.1
99-
New tld's and removal of a few tlds no longer supported at iana
100-
101-
* abb, bw, bn, crown, crs, fj (does not work), gp (does not work), weir, realtor, post, mw, pf (a strange one), iq (gives timout), mm, int, hm (does not work)
102-
103-
---
104-
105-
## in progress
106-
20+
* see the Readme at [WhoisDomain](https://github.com/mboot-github/WhoisDomain)

‎TODO‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎license‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
2-
Version 2, December 2004
1+
MIT License
32

4-
Copyright (C) 2004 Sam Hocevar <[email protected]>
3+
Copyright (c) 2023 Maarten Boot
54

6-
Everyone is permitted to copy and distribute verbatim or modified
7-
copies of this license document, and changing it is allowed as long
8-
as the name is changed.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
911

10-
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
11-
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1214

13-
0. You just DO WHAT THE FUCK YOU WANT TO.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎pyproject.toml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "whois"
7+
dynamic = ['version']
8+
9+
authors = [
10+
{ name="mboot-github"},
11+
]
12+
13+
maintainers = [
14+
{ name="Maarten Boot", email="[email protected]" },
15+
]
16+
17+
description = "Python package for retrieving WHOIS information of domains."
18+
readme = "README.md"
19+
requires-python = ">=3.9"
20+
21+
license = "MIT"
22+
23+
classifiers = [
24+
"License :: OSI Approved :: MIT License",
25+
"Operating System :: OS Independent",
26+
"Intended Audience :: Developers",
27+
"Environment :: Console",
28+
"Programming Language :: Python :: 3",
29+
"Topic :: Internet",
30+
"Topic :: Software Development :: Libraries :: Python Modules",
31+
]
32+
33+
keywords = [
34+
"Python",
35+
"whois",
36+
"tld",
37+
"domain",
38+
"expiration",
39+
"registrar",
40+
]
41+
42+
[project.urls]
43+
"Bug Tracker" = "https://github.com/mboot-github/WhoisDomain/issues"
44+
"Home Page" = "https://github.com/mboot-github/WhoisDomain/"
45+
"Repository" = "https://github.com/mboot-github/WhoisDomain/"
46+
47+
[tool.hatch.version]
48+
path = "whois/version.py"
49+
50+
[tool.hatch.build]
51+
only-packages = true
52+
53+
include = [
54+
"whois/",
55+
]
56+
57+
exclude = [
58+
"/Old/*",
59+
"/lib/*",
60+
"/etc/*",
61+
"/bin/*",
62+
"/testdata/*",
63+
"Makefile",
64+
".gitignore",
65+
"/.gitignore",
66+
]
67+
68+
[tool.pylama]
69+
max_line_length = 160
70+
skip = "*/.pytest_cache/*, */.tox/*, */mypy_cache/*, ./dist, ./docs"

‎whois/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
"""This module only makes the version available for dynamic versioning"""
2-
VERSION = "1.20231115.1"
2+
VERSION = "0.99.3"

‎work/version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.99.3

0 commit comments

Comments
 (0)