Skip to content

Commit 6293f72

Browse files
hugovkhugovk
authored
Remove deprecated --format option (#263)
2 parents 0f4afdd + b4b6cd1 commit 6293f72

File tree

2 files changed

+60
-82
lines changed

2 files changed

+60
-82
lines changed

‎README.md‎

Lines changed: 60 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ run("eol --help")
5353

5454
```console
5555
$ eol --help
56-
usage: eol [-h] [-f {html,json,md,markdown,pretty,rst,csv,tsv,yaml}] [-c {yes,no,auto}] [--clear-cache] [--show-title {yes,no,auto}] [-v] [-V] [-w]
56+
usage: eol [-h] [-c {yes,no,auto}] [--clear-cache] [--show-title {yes,no,auto}] [-v] [-V] [-w]
5757
[--pretty | --md | --rst | --json | --csv | --tsv | --html | --yaml]
5858
[product ...]
5959

@@ -73,10 +73,7 @@ positional arguments:
7373

7474
options:
7575
-h, --help show this help message and exit
76-
-f {html,json,md,markdown,pretty,rst,csv,tsv,yaml}, --format {html,json,md,markdown,pretty,rst,csv,tsv,yaml}
77-
deprecated: use direct options instead: --html, --json, --md, --pretty, --rst, --csv, --tsv or
78-
--yaml
79-
-c {yes,no,auto}, --color {yes,no,auto}
76+
-c, --color {yes,no,auto}
8077
colour the output (default: auto)
8178
--clear-cache clear cache before running
8279
--show-title {yes,no,auto}
@@ -111,11 +108,11 @@ run("eol", line_limit=5)
111108

112109
```console
113110
$ eol
111+
adonisjs
114112
akeneo-pim
113+
alibaba-ack
115114
alibaba-dragonwell
116115
almalinux
117-
alpine
118-
amazon-cdk
119116
...
120117
```
121118

@@ -132,17 +129,22 @@ $ norwegianblue python
132129
┌───────┬────────────┬─────────┬────────────────┬────────────┬────────────┐
133130
│ cycle │ release │ latest │ latest release │ support │ eol │
134131
├───────┼────────────┼─────────┼────────────────┼────────────┼────────────┤
135-
│ 3.12 │ 2023-10-02 │ 3.12.0 │ 2023-10-02 │ 2025-04-02 │ 2028-10-02 │
136-
│ 3.11 │ 2022-10-24 │ 3.11.6 │ 2023-10-02 │ 2024-04-01 │ 2027-10-24 │
137-
│ 3.10 │ 2021-10-04 │ 3.10.13 │ 2023-08-24 │ 2023-04-05 │ 2026-10-04 │
138-
│ 3.9 │ 2020-10-05 │ 3.9.18 │ 2023-08-24 │ 2022-05-17 │ 2025-10-05 │
139-
│ 3.8 │ 2019-10-14 │ 3.8.18 │ 2023-08-24 │ 2021-05-03 │ 2024-10-14 │
140-
│ 3.7 │ 2018-06-26 │ 3.7.17 │ 2023-06-05 │ 2020-06-27 │ 2023-06-27 │
141-
│ 3.6 │ 2016-12-22 │ 3.6.15 │ 2021-09-03 │ 2018-12-24 │ 2021-12-23 │
142-
│ 3.5 │ 2015-09-12 │ 3.5.10 │ 2020-09-05 │ False │ 2020-09-13 │
143-
│ 3.4 │ 2014-03-15 │ 3.4.10 │ 2019-03-18 │ False │ 2019-03-18 │
132+
│ 3.14 │ 2025-10-07 │ 3.14.0 │ 2025-10-07 │ 2027-10-01 │ 2030-10-31 │
133+
│ 3.13 │ 2024-10-07 │ 3.13.9 │ 2025-10-14 │ 2026-10-01 │ 2029-10-31 │
134+
│ 3.12 │ 2023-10-02 │ 3.12.12 │ 2025-10-09 │ 2025-04-02 │ 2028-10-31 │
135+
│ 3.11 │ 2022-10-24 │ 3.11.14 │ 2025-10-09 │ 2024-04-01 │ 2027-10-31 │
136+
│ 3.10 │ 2021-10-04 │ 3.10.19 │ 2025-10-09 │ 2023-04-05 │ 2026-10-31 │
137+
│ 3.9 │ 2020-10-05 │ 3.9.24 │ 2025-10-09 │ 2022-05-17 │ 2025-10-31 │
138+
│ 3.8 │ 2019-10-14 │ 3.8.20 │ 2024-09-06 │ 2021-05-03 │ 2024-10-07 │
139+
│ 3.7 │ 2018-06-27 │ 3.7.17 │ 2023-06-05 │ 2020-06-27 │ 2023-06-27 │
140+
│ 3.6 │ 2016-12-23 │ 3.6.15 │ 2021-09-03 │ 2018-12-24 │ 2021-12-23 │
141+
│ 3.5 │ 2015-09-13 │ 3.5.10 │ 2020-09-05 │ False │ 2020-09-30 │
142+
│ 3.4 │ 2014-03-16 │ 3.4.10 │ 2019-03-18 │ False │ 2019-03-18 │
144143
│ 3.3 │ 2012-09-29 │ 3.3.7 │ 2017-09-19 │ False │ 2017-09-29 │
144+
│ 3.2 │ 2011-02-20 │ 3.2.6 │ 2014-10-12 │ False │ 2016-02-20 │
145145
│ 2.7 │ 2010-07-03 │ 2.7.18 │ 2020-04-19 │ False │ 2020-01-01 │
146+
│ 3.1 │ 2009-06-27 │ 3.1.5 │ 2012-04-06 │ False │ 2012-04-09 │
147+
│ 3.0 │ 2008-12-03 │ 3.0.1 │ 2009-02-12 │ False │ 2009-06-27 │
146148
│ 2.6 │ 2008-10-01 │ 2.6.9 │ 2013-10-29 │ False │ 2013-10-29 │
147149
└───────┴────────────┴─────────┴────────────────┴────────────┴────────────┘
148150
```
@@ -157,17 +159,22 @@ run("eol python --md", with_console=False)
157159

158160
| cycle | release | latest | latest release | support | eol |
159161
| :---- | :--------: | :------ | :------------: | :--------: | :--------: |
160-
| 3.12 | 2023-10-02 | 3.12.0 | 2023-10-02 | 2025-04-02 | 2028-10-02 |
161-
| 3.11 | 2022-10-24 | 3.11.6 | 2023-10-02 | 2024-04-01 | 2027-10-24 |
162-
| 3.10 | 2021-10-04 | 3.10.13 | 2023-08-24 | 2023-04-05 | 2026-10-04 |
163-
| 3.9 | 2020-10-05 | 3.9.18 | 2023-08-24 | 2022-05-17 | 2025-10-05 |
164-
| 3.8 | 2019-10-14 | 3.8.18 | 2023-08-24 | 2021-05-03 | 2024-10-14 |
165-
| 3.7 | 2018-06-26 | 3.7.17 | 2023-06-05 | 2020-06-27 | 2023-06-27 |
166-
| 3.6 | 2016-12-22 | 3.6.15 | 2021-09-03 | 2018-12-24 | 2021-12-23 |
167-
| 3.5 | 2015-09-12 | 3.5.10 | 2020-09-05 | False | 2020-09-13 |
168-
| 3.4 | 2014-03-15 | 3.4.10 | 2019-03-18 | False | 2019-03-18 |
162+
| 3.14 | 2025-10-07 | 3.14.0 | 2025-10-07 | 2027-10-01 | 2030-10-31 |
163+
| 3.13 | 2024-10-07 | 3.13.9 | 2025-10-14 | 2026-10-01 | 2029-10-31 |
164+
| 3.12 | 2023-10-02 | 3.12.12 | 2025-10-09 | 2025-04-02 | 2028-10-31 |
165+
| 3.11 | 2022-10-24 | 3.11.14 | 2025-10-09 | 2024-04-01 | 2027-10-31 |
166+
| 3.10 | 2021-10-04 | 3.10.19 | 2025-10-09 | 2023-04-05 | 2026-10-31 |
167+
| 3.9 | 2020-10-05 | 3.9.24 | 2025-10-09 | 2022-05-17 | 2025-10-31 |
168+
| 3.8 | 2019-10-14 | 3.8.20 | 2024-09-06 | 2021-05-03 | 2024-10-07 |
169+
| 3.7 | 2018-06-27 | 3.7.17 | 2023-06-05 | 2020-06-27 | 2023-06-27 |
170+
| 3.6 | 2016-12-23 | 3.6.15 | 2021-09-03 | 2018-12-24 | 2021-12-23 |
171+
| 3.5 | 2015-09-13 | 3.5.10 | 2020-09-05 | False | 2020-09-30 |
172+
| 3.4 | 2014-03-16 | 3.4.10 | 2019-03-18 | False | 2019-03-18 |
169173
| 3.3 | 2012-09-29 | 3.3.7 | 2017-09-19 | False | 2017-09-29 |
174+
| 3.2 | 2011-02-20 | 3.2.6 | 2014-10-12 | False | 2016-02-20 |
170175
| 2.7 | 2010-07-03 | 2.7.18 | 2020-04-19 | False | 2020-01-01 |
176+
| 3.1 | 2009-06-27 | 3.1.5 | 2012-04-06 | False | 2012-04-09 |
177+
| 3.0 | 2008-12-03 | 3.0.1 | 2009-02-12 | False | 2009-06-27 |
171178
| 2.6 | 2008-10-01 | 2.6.9 | 2013-10-29 | False | 2013-10-29 |
172179

173180
<!-- [[[end]]] -->
@@ -182,31 +189,34 @@ run("eol nodejs --rst")
182189
$ eol nodejs --rst
183190
.. table::
184191

185-
======== ============ ========== ================ ============ ============ ======================================================================================
186-
cycle release latest latest release support eol link
187-
======== ============ ========== ================ ============ ============ ======================================================================================
188-
21 2023-10-17 21.1.0 2023-10-24 2024-04-01 2024-06-01
189-
20 LTS 2023-04-18 20.9.0 2023-10-24 2024-10-22 2026-04-30
190-
19 2022-10-18 19.9.0 2023-04-10 2023-04-01 2023-06-01
191-
18 LTS 2022-04-19 18.18.2 2023-10-13 2023-10-18 2025-04-30
192-
17 2021-10-19 17.9.1 2022-06-01 2022-04-01 2022-06-01
193-
16 LTS 2021-04-20 16.20.2 2023-08-09 2022-10-18 2023-09-11
194-
15 2020-10-20 15.14.0 2021-04-06 2021-04-01 2021-06-01
195-
14 LTS 2020-04-21 14.21.3 2023-02-16 2021-10-19 2023-04-30
196-
13 2019-10-22 13.14.0 2020-04-29 2020-04-01 2020-06-01
197-
12 LTS 2019-04-23 12.22.12 2022-04-05 2020-10-20 2022-04-30
198-
11 2018-10-23 11.15.0 2019-04-30 2019-04-01 2019-06-30
199-
10 LTS 2018-04-24 10.24.1 2021-04-06 2020-05-19 2021-04-30
200-
9 2017-10-31 9.11.2 2018-06-12 2018-06-30 2018-06-30
201-
8 LTS 2017-05-30 8.17.0 2019-12-17 2019-01-01 2019-12-31
202-
7 2016-10-25 7.10.1 2017-07-11 2017-06-30 2017-06-30
203-
6 LTS 2016-04-26 6.17.1 2019-04-03 2018-04-30 2019-04-30
204-
5 2015-10-30 5.12.0 2016-06-23 2016-06-30 2016-06-30
205-
4 LTS 2015-09-09 4.9.1 2018-03-29 2017-04-01 2018-04-30
206-
3 2015-08-04 3.3.1 2015-09-15 False True https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__
207-
2 2015-05-04 2.5.0 2015-07-28 False True https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__
208-
1 2015-01-20 1.8.4 2015-07-09 False True https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__
209-
======== ============ ========== ================ ============ ============ ======================================================================================
192+
============================================================================================== ============ ========== ================ ============ ============ ==================
193+
cycle release latest latest release support eol extended support
194+
============================================================================================== ============ ========== ================ ============ ============ ==================
195+
24 LTS 2025-05-06 24.10.0 2025-10-08 2026-10-20 2028-04-30 False
196+
23 2024-10-16 23.11.1 2025-05-14 2025-04-01 2025-06-01 False
197+
22 LTS 2024-04-24 22.20.0 2025-09-24 2025-10-21 2027-04-30 False
198+
21 2023-10-17 21.7.3 2024-04-10 2024-04-01 2024-06-01 False
199+
20 LTS 2023-04-18 20.19.5 2025-09-03 2024-10-22 2026-04-30 False
200+
19 2022-10-18 19.9.0 2023-04-10 2023-04-01 2023-06-01 False
201+
18 LTS 2022-04-19 18.20.8 2025-03-27 2023-10-18 2025-04-30 True
202+
17 2021-10-19 17.9.1 2022-06-01 2022-04-01 2022-06-01 False
203+
16 LTS 2021-04-20 16.20.2 2023-08-09 2022-10-18 2023-09-11 True
204+
15 2020-10-20 15.14.0 2021-04-06 2021-04-01 2021-06-01 False
205+
14 LTS 2020-04-21 14.21.3 2023-02-16 2021-10-19 2023-04-30 True
206+
13 2019-10-22 13.14.0 2020-04-29 2020-04-01 2020-06-01 False
207+
12 LTS 2019-04-23 12.22.12 2022-04-05 2020-10-20 2022-04-30 True
208+
11 2018-10-23 11.15.0 2019-04-30 2019-04-01 2019-06-30 False
209+
10 LTS 2018-04-24 10.24.1 2021-04-06 2020-05-19 2021-04-30 False
210+
9 2017-10-31 9.11.2 2018-06-12 2018-06-30 2018-06-30 False
211+
8 LTS 2017-05-30 8.17.0 2019-12-17 2019-01-01 2019-12-31 False
212+
7 2016-10-25 7.10.1 2017-07-11 2017-06-30 2017-06-30 False
213+
6 LTS 2016-04-26 6.17.1 2019-04-03 2018-04-30 2019-04-30 False
214+
5 2015-10-30 5.12.0 2016-06-23 2016-06-30 2016-06-30 False
215+
4 LTS 2015-09-09 4.9.1 2018-03-29 2017-04-01 2018-04-30 False
216+
`3 <https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__>`__ 2015-08-04 3.3.1 2015-09-15 False True False
217+
`2 <https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__>`__ 2015-05-04 2.5.0 2015-07-28 False True False
218+
`1 <https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_IOJS.md#__LATEST__>`__ 2015-01-20 1.8.4 2015-07-09 False True False
219+
============================================================================================== ============ ========== ================ ============ ============ ==================
210220
```
211221

212222
<!-- [[[end]]] -->

‎src/norwegianblue/cli.py‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import atexit
1919
import logging
2020
import platform
21-
import sys
2221

2322
from termcolor import colored
2423

@@ -50,26 +49,6 @@ def main() -> None:
5049
default=["all"],
5150
help="product to check, or 'all' to list all available (default: 'all')",
5251
).completer = product_completer
53-
parser.add_argument(
54-
"-f",
55-
"--format",
56-
choices=(
57-
"html",
58-
"json",
59-
"md",
60-
"markdown",
61-
"pretty",
62-
"rst",
63-
"csv",
64-
"tsv",
65-
"yaml",
66-
),
67-
help=colored(
68-
"deprecated: use direct options instead: "
69-
"--html, --json, --md, --pretty, --rst, --csv, --tsv or --yaml",
70-
"yellow",
71-
),
72-
)
7352
parser.add_argument(
7453
"-c",
7554
"--color",
@@ -132,17 +111,6 @@ def main() -> None:
132111
argcomplete.autocomplete(parser)
133112
args = parser.parse_args()
134113

135-
if args.format:
136-
from termcolor import cprint
137-
138-
cprint(
139-
"The -f/--format option is deprecated, use direct options instead: "
140-
"--html, --json, --md, --pretty, --rst, --csv, --tsv or --yaml.",
141-
"yellow",
142-
file=sys.stderr,
143-
)
144-
args.formatter = args.format
145-
146114
logging.basicConfig(level=args.loglevel, format="%(message)s")
147115
if args.clear_cache:
148116
_cache.clear(clear_all=True)

0 commit comments

Comments
 (0)