Skip to content

Commit cd877a5

Browse files
authored
Remove 3.6 support / discontinue less available platforms (#1267)
* Remove redundant systems * Drop it from the docs * Remove the packaging info about the legacy systems * Fix some typos * Drop support for python 3.6
1 parent 8762970 commit cd877a5

File tree

24 files changed

+13
-646
lines changed

24 files changed

+13
-646
lines changed

.github/workflows/test-package-linux-snap.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
run: |
2020
httpie.http --version
2121
httpie.https --version
22+
httpie --version
2223
# Auto-aliases cannot be tested when installing a snap outside the store.
2324
# http --version
2425
# https --version

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [ubuntu-latest, macos-latest, windows-latest]
23-
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
23+
python-version: [3.7, 3.8, 3.9, "3.10"]
2424
pyopenssl: [0, 1]
2525
runs-on: ${{ matrix.os }}
2626
steps:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
55

66
## [3.0.0.dev0](https://github.com/httpie/httpie/compare/2.6.0...master) (unreleased)
77

8+
- Drop support for Python 3.6. ([#1177](https://github.com/httpie/httpie/issues/1177))
89
- Improved startup time by 40%. ([#1211](https://github.com/httpie/httpie/pull/1211))
910
- Added support for nested JSON syntax. ([#1169](https://github.com/httpie/httpie/issues/1169))
1011
- Added `httpie plugins` interface for plugin management. ([#566](https://github.com/httpie/httpie/issues/566))

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ oversight. Ping one of the maintainers to get a `benchmark` label on your branch
162162

163163
If you are on a Windows machine and not able to run `make`,
164164
follow the next steps for a basic setup. As a prerequisite, you need to have
165-
Python 3.6+ installed.
165+
Python 3.7+ installed.
166166

167167
Create a virtual environment and activate it:
168168

docs/README.md

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Do not edit here, but in docs/installation/.
6060

6161
#### PyPI
6262

63-
Please make sure you have Python 3.6 or newer (`python --version`).
63+
Please make sure you have Python 3.7 or newer (`python --version`).
6464

6565
```bash
6666
# Install httpie
@@ -108,20 +108,6 @@ $ port selfupdate
108108
$ port upgrade httpie
109109
```
110110

111-
#### Spack (macOS)
112-
113-
To install [Spack](https://spack.readthedocs.io/en/latest/index.html), see [its installation](https://spack.readthedocs.io/en/latest/getting_started.html#installation).
114-
115-
```bash
116-
# Install httpie
117-
$ spack install httpie
118-
```
119-
120-
```bash
121-
# Upgrade httpie
122-
$ spack install httpie
123-
```
124-
125111
### Windows
126112

127113
#### Chocolatey
@@ -213,34 +199,6 @@ $ yum install httpie
213199
$ yum upgrade httpie
214200
```
215201

216-
#### Alpine Linux
217-
218-
```bash
219-
# Install httpie
220-
$ apk update
221-
$ apk add httpie
222-
```
223-
224-
```bash
225-
# Upgrade httpie
226-
$ apk update
227-
$ apk add --upgrade httpie
228-
```
229-
230-
#### Gentoo
231-
232-
```bash
233-
# Install httpie
234-
$ emerge --sync
235-
$ emerge httpie
236-
```
237-
238-
```bash
239-
# Upgrade httpie
240-
$ emerge --sync
241-
$ emerge --update httpie
242-
```
243-
244202
#### Arch Linux
245203

246204
Also works for other Arch-derived distributions like ArcoLinux, EndeavourOS, Artix Linux, etc.
@@ -255,34 +213,6 @@ $ pacman -Sy httpie
255213
$ pacman -Syu httpie
256214
```
257215

258-
#### Void Linux
259-
260-
```bash
261-
# Install httpie
262-
$ xbps-install -Su
263-
$ xbps-install -S httpie
264-
```
265-
266-
```bash
267-
# Upgrade httpie
268-
$ xbps-install -Su
269-
$ xbps-install -Su httpie
270-
```
271-
272-
#### Spack (Linux)
273-
274-
To install [Spack](https://spack.readthedocs.io/en/latest/index.html), see [its installation](https://spack.readthedocs.io/en/latest/getting_started.html#installation).
275-
276-
```bash
277-
# Install httpie
278-
$ spack install httpie
279-
```
280-
281-
```bash
282-
# Upgrade httpie
283-
$ spack install httpie
284-
```
285-
286216
### FreeBSD
287217

288218
#### FreshPorts

docs/installation/methods.yml

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ docs-structure:
1414
macOS:
1515
- brew-mac
1616
- port
17-
- spack-mac
1817
Windows:
1918
- chocolatey
2019
Linux:
@@ -23,29 +22,11 @@ docs-structure:
2322
- apt
2423
- dnf
2524
- yum
26-
- apk
27-
- emerge
2825
- pacman
29-
- xbps-install
30-
- spack-linux
3126
FreeBSD:
3227
- pkg
3328

3429
tools:
35-
apk:
36-
title: Alpine Linux
37-
name: apk
38-
links:
39-
homepage: https://wiki.alpinelinux.org/wiki/Alpine_Linux_package_management
40-
package: https://pkgs.alpinelinux.org/package/edge/community/x86/httpie
41-
commands:
42-
install:
43-
- apk update
44-
- apk add httpie
45-
upgrade:
46-
- apk update
47-
- apk add --upgrade httpie
48-
4930
apt:
5031
title: Debian and Ubuntu
5132
note: Also works for other Debian-derived distributions like MX Linux, Linux Mint, deepin, Pop!_OS, KDE neon, Zorin OS, elementary OS, Kubuntu, Devuan, Linux Lite, Peppermint OS, Lubuntu, antiX, Xubuntu, etc.
@@ -116,20 +97,6 @@ tools:
11697
upgrade:
11798
- dnf upgrade httpie
11899

119-
emerge:
120-
title: Gentoo
121-
name: Portage
122-
links:
123-
homepage: https://wiki.gentoo.org/wiki/Portage
124-
package: https://packages.gentoo.org/packages/net-misc/httpie
125-
commands:
126-
install:
127-
- emerge --sync
128-
- emerge httpie
129-
upgrade:
130-
- emerge --sync
131-
- emerge --update httpie
132-
133100
pacman:
134101
title: Arch Linux
135102
name: pacman
@@ -173,7 +140,7 @@ tools:
173140
pypi:
174141
title: PyPI
175142
name: pip
176-
note: Please make sure you have Python 3.6 or newer (`python --version`).
143+
note: Please make sure you have Python 3.7 or newer (`python --version`).
177144
links:
178145
homepage: https://pypi.org/
179146
# setup: https://pip.pypa.io/en/stable/installation/
@@ -199,43 +166,6 @@ tools:
199166
upgrade:
200167
- snap refresh httpie
201168

202-
spack-linux:
203-
title: Spack (Linux)
204-
name: Spack
205-
links:
206-
homepage: https://spack.readthedocs.io/en/latest/index.html
207-
setup: https://spack.readthedocs.io/en/latest/getting_started.html#installation
208-
commands:
209-
install:
210-
- spack install httpie
211-
upgrade:
212-
- spack install httpie
213-
214-
spack-mac:
215-
title: Spack (macOS)
216-
name: Spack
217-
links:
218-
homepage: https://spack.readthedocs.io/en/latest/index.html
219-
setup: https://spack.readthedocs.io/en/latest/getting_started.html#installation
220-
commands:
221-
install:
222-
- spack install httpie
223-
upgrade:
224-
- spack install httpie
225-
226-
xbps-install:
227-
title: Void Linux
228-
name: XBPS
229-
links:
230-
homepage: https://docs.voidlinux.org/xbps/index.html
231-
commands:
232-
install:
233-
- xbps-install -Su
234-
- xbps-install -S httpie
235-
upgrade:
236-
- xbps-install -Su
237-
- xbps-install -Su httpie
238-
239169
yum:
240170
title: CentOS and RHEL
241171
name: Yum

docs/packaging/README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ You are looking at the HTTPie packaging documentation, where you will find valua
1212

1313
The overall release process starts simple:
1414

15-
1. Do the [PyPi](https://pypi.org/project/httpie/) publication.
15+
1. Do the [PyPI](https://pypi.org/project/httpie/) publication.
1616
2. Then, handle company-related tasks.
1717
3. Finally, follow OS-specific steps, described in documents below, to send patches downstream.
1818

19-
## First, PyPi
19+
## First, PyPI
2020

2121
Let's do the release on [PyPi](https://pypi.org/project/httpie/).
2222
That is done quite easily by manually triggering the [release workflow](https://github.com/httpie/httpie/actions/workflows/release.yml).
@@ -34,18 +34,13 @@ A more complete state of deployment can be found on [repology](https://repology.
3434

3535
| OS | Maintainer |
3636
| -------------------------------------------: | -------------- |
37-
| [Alpine](linux-alpine/) | **HTTPie** |
3837
| [Arch Linux, and derived](linux-arch/) | trusted person |
39-
| :construction: [AOSC OS](linux-aosc/) | **HTTPie** |
4038
| [CentOS, RHEL, and derived](linux-centos/) | trusted person |
4139
| [Debian, Ubuntu, and derived](linux-debian/) | trusted person |
4240
| [Fedora](linux-fedora/) | trusted person |
43-
| [Gentoo](linux-gentoo/) | **HTTPie** |
4441
| :construction: [Homebrew, Linuxbrew](brew/) | **HTTPie** |
4542
| :construction: [MacPorts](mac-ports/) | **HTTPie** |
4643
| [Snapcraft](snapcraft/) | **HTTPie** |
47-
| [Spack](spack/) | **HTTPie** |
48-
| [Void Linux](linux-void/) | **HTTPie** |
4944
| [Windows — Chocolatey](windows-chocolatey/) | **HTTPie** |
5045

5146
:new: You do not find your system or you would like to see HTTPie supported on another OS? Then [let us know](https://github.com/httpie/httpie/issues/).

docs/packaging/linux-alpine/APKBUILD

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

docs/packaging/linux-alpine/README.md

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

0 commit comments

Comments
 (0)