Skip to content

Commit cdc987d

Browse files
authored
Merge pull request #379 from yozachar/workshop
hotfix: ensure `_tld.txt` is in `sdist` and `bdist`
2 parents cfa5aa1 + 8cf75e5 commit cdc987d

File tree

7 files changed

+28
-10
lines changed

7 files changed

+28
-10
lines changed

CHANGES.md

+17
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,22 @@ Note to self: Breaking changes must increment either
99
1010
-->
1111

12+
## 0.28.3 (2024-05-25)
13+
14+
_**Breaking**_
15+
16+
> No breaking changes were introduced in this version.
17+
18+
_**Features**_
19+
20+
> No features were introduced in this version.
21+
22+
_**Maintenance**_
23+
24+
- hotfix: ensure `_tld.txt` is in `sdist` and `bdist` by @yozachar in [#379](https://github.com/python-validators/validators/pull/379)
25+
26+
**Full Changelog**: [`0.28.2...0.28.3`](https://github.com/python-validators/validators/compare/0.28.2...0.28.3)
27+
1228
## 0.28.2 (2024-05-24)
1329

1430
_**Breaking**_
@@ -26,6 +42,7 @@ _**Maintenance**_
2642
- fix(ip_address): properly handle private is false by @grleblanc in [#374](https://github.com/python-validators/validators/pull/374)
2743
- chore(url): allow symbols and pictographs in url by @prousso in [#375](https://github.com/python-validators/validators/pull/375)
2844
- build(deps): bump requests from 2.31.0 to 2.32.0 in /package by @dependabot in [#376](https://github.com/python-validators/validators/pull/376)
45+
- chore: fix typo; update dev deps; bump version by @yozachar in [#377](https://github.com/python-validators/validators/pull/377)
2946

3047
**Full Changelog**: [`0.28.1...0.28.2`](https://github.com/python-validators/validators/compare/0.28.1...0.28.2)
3148

CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Hi, to start, you need the following installed on your system.
88
4. (Optional/Recommended) NodeJS for type checking
99
5. (Optional/Recommended) [mise](https://github.com/jdx/mise) to manage multiple versions of Python & NodeJS.
1010

11-
First [fork this repository](https://github.com/python-validators/validators/fork). Clone it to your system. Install development dependencies.
11+
First [fork this repository](https://github.com/python-validators/validators/fork). Uncheck "fork only `master`", because for versioned docs you'll need `gh-pages` too. Clone it to your system. Install development dependencies.
1212

1313
```sh
1414
# clone repository
@@ -78,11 +78,11 @@ $ python -m http.server -d docs/_build/web
7878
$ git push upstream --tag
7979
```
8080

81-
4. To update versioned docs, you must track the `gh-pages` onto a local branch. `git checkout --track upstream/gh-pages`, once.
82-
5. Checkout to the tag you want to include in the versioned documentation `git checkout TAG_NAME`.
83-
6. Then using [`mike`](https://github.com/jimporter/mike) (which is already a dev dependency) run `mike deploy -p -u VERSION stable`.
84-
7. Or use `mike deploy -p -u dev master`, which will deploy docs in the CURRENT commit as the `latest` documentation.
85-
8. Run `./package/roll.sh` (or `./package/roll.ps1`) to generate both sdist and bdist.
81+
4. To prevew versioned docs, run `mike serve` (`mike` is already a dev dependency).
82+
5. To update it, checkout to the tag you want to include in the versioned documentation `git checkout TAG_NAME`.
83+
6. Then run `mike deploy -p -u VERSION stable` OR run `mike deploy -p -u dev master`,
84+
7. Which will deploy docs in the CURRENT commit as the `latest` documentation, onto `gh-pages` branch.
85+
8. Run `./package/roll.sh` (or `./package/roll.ps1`) to generate both `sdist` and `bdist`.
8686
9. Install [`twine`](https://pypi.org/project/twine) using [`pipx`](https://pipx.pypa.io) to upload package to PyPI.
8787

8888
```sh

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
| Version | Supported |
66
| ---------- | ------------------ |
7-
| `>=0.28.2` | :white_check_mark: |
7+
| `>=0.28.3` | :white_check_mark: |
88

99
## Reporting a Vulnerability
1010

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ include = ["validators*"]
8888
namespaces = false
8989

9090
[tool.setuptools.package-data]
91-
validators = ["py.typed"]
91+
validators = ["py.typed", "_tld.txt"]
9292

9393
[tool.setuptools.dynamic]
9494
version = { attr = "validators.__version__" }

src/validators/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@
105105
"validator",
106106
)
107107

108-
__version__ = "0.28.2"
108+
__version__ = "0.28.3"

src/validators/_tld.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version 2024040300, Last Updated Wed Apr 3 07:07:01 2024 UTC
1+
# Version 2024052400, Last Updated Fri May 24 07:07:01 2024 UTC
22
AAA
33
AARP
44
ABB

src/validators/domain.py

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
def _iana_tld():
1212
"""Load IANA TLDs as a Generator."""
13+
# source: https://data.iana.org/TLD/tlds-alpha-by-domain.txt
1314
with Path(__file__).parent.joinpath("_tld.txt").open() as tld_f:
1415
_ = next(tld_f) # ignore the first line
1516
for line in tld_f:

0 commit comments

Comments
 (0)