From 419427cfb60781c44b9030e84db8f8ad20802284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= Date: Tue, 19 Oct 2021 10:18:35 +0200 Subject: [PATCH] Update downstream files for HTTPie 2.6.0 (#1186) * Update Alpine package * Add charset-normalizer deps for Alpine It currently does not exist. We will need to add it ourselves. * Update Gentoo package * Update Brew formula * Update MacPorts port * Fix Gentoo deps * Update examples * Update Void Linux package * Update Void Linux commands * Update Chocolateur package * Review DEbian packaging details * Simplify Void Linux package * Update more packages * Update summary everywhere * Remove temporary file * Update Chocolatey package URL * Updates * Update Spack --- docs/README.md | 2 +- docs/packaging/brew/README.md | 2 +- docs/packaging/brew/httpie.rb | 32 +-- docs/packaging/linux-alpine/APKBUILD | 18 +- docs/packaging/linux-aosc/autobuild/defines | 8 + docs/packaging/linux-arch/PKGBUILD | 9 +- docs/packaging/linux-debian/README.md | 4 +- docs/packaging/linux-fedora/httpie.spec.txt | 248 ++++++++++++++++++ docs/packaging/linux-gentoo/Manifest | 1 + docs/packaging/linux-gentoo/README.md | 2 +- ...ttpie-2.5.0.ebuild => httpie-2.6.0.ebuild} | 3 +- docs/packaging/linux-void/README.md | 7 +- docs/packaging/linux-void/template | 11 +- docs/packaging/mac-ports/Portfile | 22 +- docs/packaging/mac-ports/README.md | 2 +- docs/packaging/spack/README.md | 12 +- docs/packaging/spack/package.py | 28 +- .../windows-chocolatey/httpie.nuspec | 8 +- httpie/__init__.py | 2 +- 19 files changed, 348 insertions(+), 73 deletions(-) create mode 100644 docs/packaging/linux-aosc/autobuild/defines create mode 100644 docs/packaging/linux-fedora/httpie.spec.txt rename docs/packaging/linux-gentoo/{httpie-2.5.0.ebuild => httpie-2.6.0.ebuild} (89%) diff --git a/docs/README.md b/docs/README.md index 7f6a7af9..d4e16b6d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1422,7 +1422,7 @@ HTTPie does several things by default in order to make its terminal output easy ### Colors and formatting Syntax highlighting is applied to HTTP headers and bodies (where it makes sense). -You can choose your preferred color scheme via the --style option if you don’t like the default one. +You can choose your preferred color scheme via the `--style` option if you don’t like the default one. There are dozens of styles available, here are just a few notable ones: | Style | Description | diff --git a/docs/packaging/brew/README.md b/docs/packaging/brew/README.md index ac5919ea..2acb3299 100644 --- a/docs/packaging/brew/README.md +++ b/docs/packaging/brew/README.md @@ -26,7 +26,7 @@ git commit -s -m 'Update brew formula to XXX' That [GitHub workflow](https://github.com/httpie/httpie/actions/workflows/test-package-mac-brew.yml) will test the formula when `downstream/mac/brew/httpie.rb` is changed in a pull request. -Then, open a pull request with those changes to the [downstream file]([ file](https://github.com/Homebrew/homebrew-core/blob/master/Formula/httpie.rb)). +Then, open a pull request with those changes to the [downstream file](https://github.com/Homebrew/homebrew-core/blob/master/Formula/httpie.rb). ## Hacking diff --git a/docs/packaging/brew/httpie.rb b/docs/packaging/brew/httpie.rb index d10be2b9..6a01ca23 100644 --- a/docs/packaging/brew/httpie.rb +++ b/docs/packaging/brew/httpie.rb @@ -3,29 +3,29 @@ class Httpie < Formula desc "User-friendly cURL replacement (command-line HTTP client)" homepage "https://httpie.io/" - url "https://files.pythonhosted.org/packages/90/64/7ea8066309970f787653bdc8c5328272a5c4d06cbce3a07a6a5c3199c3d7/httpie-2.5.0.tar.gz" - sha256 "fe6a8bc50fb0635a84ebe1296a732e39357c3e1354541bf51a7057b4877e47f9" + url "https://files.pythonhosted.org/packages/53/96/cbcfec73c186f076e4443faf3d91cbbc868f18f6323703afd348b1aba46d/httpie-2.6.0.tar.gz" + sha256 "ef929317b239bbf0a5bb7159b4c5d2edbfc55f8a0bcf9cd24ce597daec2afca5" license "BSD-3-Clause" head "https://github.com/httpie/httpie.git" bottle do - sha256 cellar: :any_skip_relocation, arm64_big_sur: "01115f69aff0399b3f73af09899a42a14343638a4624a35749059cc732c49cdc" - sha256 cellar: :any_skip_relocation, big_sur: "53f07157f00edf8193b7d4f74f247f53e1796fbc3e675cd2fbaa4b9dc2bad62c" - sha256 cellar: :any_skip_relocation, catalina: "7cf216fdee98208856d654060fdcad3968623d7ed27fcdeba27d3120354c9a9f" - sha256 cellar: :any_skip_relocation, mojave: "28adb5aed8c1c2b39c51789f242ff0dffde39073e161deb379c79184d787d063" - sha256 cellar: :any_skip_relocation, x86_64_linux: "91cb8c332c643bd8b1d0a8f3ec0acd4770b407991f6de1fd320d675f2b2e95ec" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "52946f8c07e853a3f4fa4e629c42f3655ba4eaba5fdf204bbc365377e65bbf85" + sha256 cellar: :any_skip_relocation, big_sur: "aa6fdb95027863739c34d53a5788f4dfb4593a6cde1a1f54e2bfb9c25d673ff3" + sha256 cellar: :any_skip_relocation, catalina: "ef2d994c88121e8059952c5716ff81246a8a0745ca2e3ed50249093d76d93f12" + sha256 cellar: :any_skip_relocation, mojave: "9ebdd4ac816cf6d1ed306e8cbef4a7442c7318bedd6b0f9d3809c8963a46a566" + sha256 cellar: :any_skip_relocation, x86_64_linux: "768b8806307683e91867df6975803597437c12966cc9fa4b7a4bda322fa3d7c0" end - depends_on "python@3.9" + depends_on "python@3.10" resource "certifi" do - url "https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9/certifi-2021.5.30.tar.gz" - sha256 "2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee" + url "https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f/certifi-2021.10.8.tar.gz" + sha256 "78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872" end resource "charset-normalizer" do - url "https://files.pythonhosted.org/packages/e7/4e/2af0238001648ded297fb54ceb425ca26faa15b341b4fac5371d3938666e/charset-normalizer-2.0.4.tar.gz" - sha256 "f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3" + url "https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1/charset-normalizer-2.0.7.tar.gz" + sha256 "e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0" end resource "defusedxml" do @@ -34,8 +34,8 @@ class Httpie < Formula end resource "idna" do - url "https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005/idna-3.2.tar.gz" - sha256 "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3" + url "https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436/idna-3.3.tar.gz" + sha256 "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" end resource "Pygments" do @@ -59,8 +59,8 @@ class Httpie < Formula end resource "urllib3" do - url "https://files.pythonhosted.org/packages/4f/5a/597ef5911cb8919efe4d86206aa8b2658616d676a7088f0825ca08bd7cb8/urllib3-1.26.6.tar.gz" - sha256 "f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" + url "https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73/urllib3-1.26.7.tar.gz" + sha256 "4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece" end def install diff --git a/docs/packaging/linux-alpine/APKBUILD b/docs/packaging/linux-alpine/APKBUILD index 9669e69b..17ffda2d 100644 --- a/docs/packaging/linux-alpine/APKBUILD +++ b/docs/packaging/linux-alpine/APKBUILD @@ -3,14 +3,22 @@ # Contributor: Daniel Isaksen # Contributor: Mickaël Schoentgen pkgname=httpie -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=0 -pkgdesc="CLI, cURL-like tool" +pkgdesc="Modern, user-friendly command-line HTTP client for the API era" url="https://httpie.org/" arch="noarch" license="BSD-3-Clause" -depends="python3 py3-setuptools py3-requests py3-pygments py3-requests-toolbelt py3-pysocks py3-defusedxml" -makedepends="py3-setuptools" +depends=" + python3 + py3-setuptools + py3-requests + py3-pygments + py3-requests-toolbelt + py3-pysocks + py3-defusedxml + py3-charset-normalizer + " checkdepends="py3-pytest py3-pytest-httpbin py3-responses" source="https://files.pythonhosted.org/packages/source/h/httpie/httpie-$pkgver.tar.gz" @@ -30,4 +38,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3bfe572b03bfde87d5a02f9ba238f9493b32e587c33fd30600a4dd6a45082eedcb2b507c7f1e3e75a423cbdcc1ff0556138897dffb7888d191834994eae9a2aa httpie-2.5.0.tar.gz" +sha512sums="a38e9769c1994fcb4e5f898e5a72283c636ea155f1fc4d594eb59c43fe98115335dec4fddd6d4e396bd11b674715c573d2fc40c4afb732ba31da0cb8e2068fd2 httpie-2.6.0.tar.gz" diff --git a/docs/packaging/linux-aosc/autobuild/defines b/docs/packaging/linux-aosc/autobuild/defines new file mode 100644 index 00000000..e59dea20 --- /dev/null +++ b/docs/packaging/linux-aosc/autobuild/defines @@ -0,0 +1,8 @@ +PKGNAME=httpie +PKGSEC=utils +PKGDEP="charset-normalizer defusedxml requests toolbelt pygments pysocks" +PKGDES="Modern, user-friendly command-line HTTP client for the API era" + +ABHOST=noarch +ABTYPE=python +NOPYTHON2=1 diff --git a/docs/packaging/linux-arch/PKGBUILD b/docs/packaging/linux-arch/PKGBUILD index 7b0b3130..d483fd67 100644 --- a/docs/packaging/linux-arch/PKGBUILD +++ b/docs/packaging/linux-arch/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Thomas Weißschuh pkgname=httpie -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=1 pkgdesc="human-friendly CLI HTTP client for the API era" url="https://github.com/httpie/httpie" @@ -12,7 +12,8 @@ depends=('python-defusedxml' 'python-pygments' 'python-pysocks' 'python-requests' - 'python-requests-toolbelt') + 'python-requests-toolbelt' + 'python-charset-normalizer') makedepends=('python-setuptools') checkdepends=('python-pytest' 'python-pytest-httpbin' @@ -22,7 +23,7 @@ replaces=(python-httpie python2-httpie) license=('BSD') arch=('any') source=($pkgname-$pkgver.tar.gz::"https://github.com/httpie/httpie/archive/$pkgver.tar.gz") -sha256sums=('66af56e0efc1ca6237323f1186ba34bca1be24e67a4319fd5df7228ab986faea') +sha256sums=('3bcd9a8cb2b11299da12d3af36c095c6d4b665e41c395898a07f1ae4d99fc14a') build() { cd $pkgname-$pkgver @@ -42,5 +43,5 @@ package() { check() { cd $pkgname-$pkgver - PYTHONDONTWRITEBYTECODE=1 python3 setup.py test + PYTHONDONTWRITEBYTECODE=1 pytest tests } diff --git a/docs/packaging/linux-debian/README.md b/docs/packaging/linux-debian/README.md index dfea5a8a..f43ff3c4 100644 --- a/docs/packaging/linux-debian/README.md +++ b/docs/packaging/linux-debian/README.md @@ -19,11 +19,11 @@ Open a new bug on the Debian Bug Tracking System by sending an email: - To: `Debian Bug Tracking System ` - Subject: `httpie: Version XXX available` -- Message template ([example](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=993937)): +- Message template (examples [1](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=993937), and [2](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996479)): ```email Package: httpie - Severity: wishlist + Severity: normal ``` diff --git a/docs/packaging/linux-fedora/httpie.spec.txt b/docs/packaging/linux-fedora/httpie.spec.txt new file mode 100644 index 00000000..8dc4e6b3 --- /dev/null +++ b/docs/packaging/linux-fedora/httpie.spec.txt @@ -0,0 +1,248 @@ +Name: httpie +Version: 2.6.0 +Release: 1%{?dist} +Summary: A Curl-like tool for humans + +License: BSD +URL: https://httpie.org/ +Source0: https://github.com/httpie/httpie/archive/%{version}/%{name}-%{version}.tar.gz + +BuildArch: noarch + +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros + +BuildRequires: help2man + +%description +HTTPie is a CLI HTTP utility built out of frustration with existing tools. The +goal is to make CLI interaction with HTTP-based services as human-friendly as +possible. + +HTTPie does so by providing an http command that allows for issuing arbitrary +HTTP requests using a simple and natural syntax and displaying colorized +responses. + + +%prep +%autosetup -p1 + + +%generate_buildrequires +%pyproject_buildrequires -rx test + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files httpie + +# Bash completion +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions +cp -a extras/httpie-completion.bash %{buildroot}%{_datadir}/bash-completion/completions/http +ln -s ./http %{buildroot}%{_datadir}/bash-completion/completions/https + +# Fish completion +mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d/ +cp -a extras/httpie-completion.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/http.fish +ln -s ./http.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/https.fish + + +# Generate man pages for everything +export PYTHONPATH=%{buildroot}%{python3_sitelib} +mkdir -p %{buildroot}%{_mandir}/man1 +help2man %{buildroot}%{_bindir}/http > %{buildroot}%{_mandir}/man1/http.1 +help2man %{buildroot}%{_bindir}/https > %{buildroot}%{_mandir}/man1/https.1 + + +%check +%pytest -v + + +%files -f %{pyproject_files} +%doc README.md +%license LICENSE +%{_bindir}/http +%{_bindir}/https +%{_mandir}/man1/http.1* +%{_mandir}/man1/https.1* +# we co-own the entire directory structures for bash/fish completion to avoid a dependency +%{_datadir}/bash-completion/ +%{_datadir}/fish/ + + +%changelog +* Fri Oct 15 2021 Miro Hrončok - 2.6.0-1 +- Update to 2.6.0 +- Fixes: rhbz#2014022 + +* Tue Sep 07 2021 Miro Hrončok - 2.5.0-1 +- Update to 2.5.0 +- Fixes: rhbz#2001693 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.4.0-3 +- Rebuilt for Python 3.10 + +* Thu May 27 2021 Miro Hrončok - 2.4.0-2 +- Add Bash and Fish completion +- Fixes rhbz#1834441 +- Run tests on build time + +* Wed Mar 24 2021 Mikel Olasagasti Uranga - 2.4.0-1 +- Update to 2.4.0 +- Use pypi_source macro + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 21 2021 Nils Philippsen - 2.3.0-2 +- use macros for Python dependencies +- add missing Python dependencies needed for running help2man +- remove manual Python dependencies +- discard stderr when running help2man + +* Thu Dec 24 2020 Nils Philippsen - 2.3.0-1 +- version 2.3.0 +- Python 2 is no more +- use %%autosetup and Python build macros +- remove EL7-isms +- explicitly require sed for building + +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.0.3-3 +- Rebuilt for Python 3.9 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Sep 30 2019 Rick Elrod - 1.0.3-1 +- Latest upstream + +* Mon Aug 19 2019 Miro Hrončok - 0.9.4-15 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.9.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.9.4-11 +- Rebuilt for Python 3.7 + +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Mar 10 2017 Ralph Bean - 0.9.4-8 +- Fix help2man usage with python3. + https://bugzilla.redhat.com/show_bug.cgi?id=1430733 + +* Mon Feb 27 2017 Ralph Bean - 0.9.4-7 +- Fix missing Requires. https://bugzilla.redhat.com/show_bug.cgi?id=1417730 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 2 2017 Ricky Elrod - 0.9.4-5 +- Add missing Obsoletes. + +* Mon Jan 2 2017 Ricky Elrod - 0.9.4-4 +- Nuke python-version-specific subpackages. Just use py3 if we can. + +* Mon Dec 19 2016 Miro Hrončok - 0.9.4-3 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.9.4-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Jul 05 2016 Ricky Elrod - 0.9.4-1 +- Update to latest upstream. + +* Fri Jun 03 2016 Ricky Elrod - 0.9.3-4 +- Add proper Obsoletes for rhbz#1329226. + +* Wed Feb 03 2016 Fedora Release Engineering - 0.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 04 2016 Ralph Bean - 0.9.3-2 +- Modernize python macros and subpackaging. +- Move LICENSE to %%license macro. +- Make python3 the default on modern Fedora. + +* Mon Jan 04 2016 Ralph Bean - 0.9.3-1 +- new version + +* Tue Nov 10 2015 Fedora Release Engineering - 0.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Ricky Elrod - 0.9.2-1 +- Latest upstream release. + +* Sat Jun 07 2014 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Kalev Lember - 0.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Fri Jan 31 2014 Ricky Elrod - 0.8.0-1 +- Latest upstream release. + +* Fri Oct 4 2013 Ricky Elrod - 0.7.2-2 +- Add in patch to work without having python-requests 2.0.0. + +* Sat Sep 28 2013 Ricky Elrod - 0.7.2-1 +- Latest upstream release. + +* Thu Sep 5 2013 Ricky Elrod - 0.6.0-7 +- Only try building the manpage on Fedora, since RHEL's help2man doesn't + have the --no-discard-stderr flag. + +* Thu Sep 5 2013 Ricky Elrod - 0.6.0-6 +- Loosen the requirement on python-pygments. + +* Sat Aug 03 2013 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 2 2013 Ricky Elrod - 0.6.0-4 +- python-requests 1.2.3 exists in rawhide now. + +* Sun Jun 30 2013 Ricky Elrod - 0.6.0-3 +- Patch to use python-requests 1.1.0 for now. + +* Sat Jun 29 2013 Ricky Elrod - 0.6.0-2 +- Update to latest upstream release. + +* Mon Apr 29 2013 Ricky Elrod - 0.5.0-2 +- Fix changelog messup. + +* Mon Apr 29 2013 Ricky Elrod - 0.5.0-1 +- Update to latest upstream release. + +* Mon Apr 8 2013 Ricky Elrod - 0.4.1-3 +- Fix manpage generation by exporting PYTHONPATH. + +* Tue Mar 26 2013 Ricky Elrod - 0.4.1-2 +- Include Python3 support, and fix other review blockers. + +* Mon Mar 11 2013 Ricky Elrod - 0.4.1-1 +- Update to latest upstream release + +* Thu Jul 19 2012 Ricky Elrod - 0.2.5-1 +- Initial build. diff --git a/docs/packaging/linux-gentoo/Manifest b/docs/packaging/linux-gentoo/Manifest index 3779e5c1..e11717c6 100644 --- a/docs/packaging/linux-gentoo/Manifest +++ b/docs/packaging/linux-gentoo/Manifest @@ -1,2 +1,3 @@ DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced720b35217930865ae3f8e168193cc33dfecc13c5d310f52647d6e79d17b247f56e56e8586d633a2d9502be66a7 SHA512 f14aa23fea7578181b9bd6ededea04de9ddf0b2f697b23f76d2d96e2c17b95617318c711750bad6af550400dbc03732ab17fdf84e59d577f33f073e600a55330 +DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af05357aa19282b514b813351efabe783f47ab82d292117e0a9170ff793b71356941dc4eb159c585629cae3adec9b5a SHA512 acd7dc847b67e27909c49ccddec84321c4d73fa5b49f06ce3d94d790093a8f168a1c6627bc4921ca8c0e48b9904f38e17935b645495e2313d16ac2eecf659038 diff --git a/docs/packaging/linux-gentoo/README.md b/docs/packaging/linux-gentoo/README.md index 35fbce7c..cbb12ce5 100644 --- a/docs/packaging/linux-gentoo/README.md +++ b/docs/packaging/linux-gentoo/README.md @@ -13,7 +13,7 @@ We will discuss setting up the environment, installing development tools, instal ## Overall process -Open a pull request to create `httpie-XXX.ebuild` and update `Manifest`. +Open a pull request to create `httpie-XXX.ebuild` and update `Manifest` ([example](https://github.com/macports/macports-ports/pull/12583)). - Here is how to calculate the size and checksum (replace `2.5.0` with the correct version): diff --git a/docs/packaging/linux-gentoo/httpie-2.5.0.ebuild b/docs/packaging/linux-gentoo/httpie-2.6.0.ebuild similarity index 89% rename from docs/packaging/linux-gentoo/httpie-2.5.0.ebuild rename to docs/packaging/linux-gentoo/httpie-2.6.0.ebuild index 00420956..9190f742 100644 --- a/docs/packaging/linux-gentoo/httpie-2.5.0.ebuild +++ b/docs/packaging/linux-gentoo/httpie-2.6.0.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE="ssl(+)" inherit bash-completion-r1 distutils-r1 -DESCRIPTION="Modern command line HTTP client" +DESCRIPTION="Modern, user-friendly command-line HTTP client for the API era" HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -18,6 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + dev-python/charset_normalizer[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] diff --git a/docs/packaging/linux-void/README.md b/docs/packaging/linux-void/README.md index 3b6c9143..7836851d 100644 --- a/docs/packaging/linux-void/README.md +++ b/docs/packaging/linux-void/README.md @@ -13,8 +13,9 @@ We will discuss setting up the environment, installing development tools, instal ## Overall process -Open a pull request to update the [downstream file](https://github.com/void-linux/void-packages/blob/master/srcpkgs/httpie/template) ([example](https://github.com/void-linux/void-packages/pull/32905)). +Open a pull request to update the [downstream file](https://github.com/void-linux/void-packages/blob/master/srcpkgs/httpie/template) ([example](https://github.com/void-linux/void-packages/pull/33539)). +- The `revision` must be set to `0`. - The commit message must be `httpie: update to XXX.`. - The commit must be signed-off (`git commit -s`). @@ -50,6 +51,10 @@ xlint srcpkgs/httpie/template ln -s / masterdir # Enable ethereal chroot-style +echo XBPS_BUILD_ENVIRONMENT=void-packages-ci >> etc/conf +echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf +echo XBPS_CHROOT_CMD=ethereal >> etc/conf +echo XBPS_ALLOW_CHROOT_BREAKOUT=yes >> etc/conf export XBPS_ALLOW_CHROOT_BREAKOUT=yes ./xbps-src binary-bootstrap ./xbps-src chroot diff --git a/docs/packaging/linux-void/template b/docs/packaging/linux-void/template index 1a9a418a..86a86bfd 100644 --- a/docs/packaging/linux-void/template +++ b/docs/packaging/linux-void/template @@ -1,18 +1,19 @@ # Template file for 'httpie' pkgname=httpie -version=2.5.0 +version=2.6.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-requests python3-requests-toolbelt - python3-Pygments python3-pysocks python3-defusedxml" -short_desc="Human-friendly command line HTTP client" + python3-Pygments python3-pysocks python3-defusedxml + python3-charset-normalizer" +short_desc="Modern, user-friendly command-line HTTP client for the API era" maintainer="Mickaël Schoentgen " license="BSD-3-Clause" homepage="https://httpie.io/" -changelog="https://raw.githubusercontent.com/httpie/httpie/${version}/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md" distfiles="https://github.com/httpie/httpie/archive/${version}.tar.gz" -checksum=66af56e0efc1ca6237323f1186ba34bca1be24e67a4319fd5df7228ab986faea +checksum=3bcd9a8cb2b11299da12d3af36c095c6d4b665e41c395898a07f1ae4d99fc14a make_check=no # needs pytest_httpbin which is not packaged post_install() { diff --git a/docs/packaging/mac-ports/Portfile b/docs/packaging/mac-ports/Portfile index 3f6218e9..26c91d82 100644 --- a/docs/packaging/mac-ports/Portfile +++ b/docs/packaging/mac-ports/Portfile @@ -4,11 +4,11 @@ PortSystem 1.0 PortGroup github 1.0 PortGroup python 1.0 -github.setup httpie httpie 2.5.0 +github.setup httpie httpie 2.6.0 maintainers {g5pw @g5pw} openmaintainer categories net -description HTTPie is a command line HTTP client, a user-friendly cURL replacement. +description Modern, user-friendly command-line HTTP client for the API era long_description HTTPie (pronounced aych-tee-tee-pie) is a command line HTTP \ client. Its goal is to make CLI interaction with web \ services as human-friendly as possible. It provides a simple \ @@ -20,10 +20,11 @@ platforms darwin license BSD homepage https://httpie.io/ -variant python36 conflicts python37 python38 python39 description "Use Python 3.6" {} -variant python37 conflicts python36 python38 python39 description "Use Python 3.7" {} -variant python38 conflicts python36 python37 python39 description "Use Python 3.8" {} -variant python39 conflicts python36 python37 python38 description "Use Python 3.9" {} +variant python36 conflicts python37 python38 python39 python310 description "Use Python 3.6" {} +variant python37 conflicts python36 python38 python39 python310 description "Use Python 3.7" {} +variant python38 conflicts python36 python37 python39 python310 description "Use Python 3.8" {} +variant python39 conflicts python36 python37 python38 python310 description "Use Python 3.9" {} +variant python310 conflicts python36 python37 python38 python39 description "Use Python 3.10" {} if {[variant_isset python36]} { python.default_version 36 @@ -31,6 +32,8 @@ if {[variant_isset python36]} { python.default_version 37 } elseif {[variant_isset python39]} { python.default_version 39 +} elseif {[variant_isset python310]} { + python.default_version 310 } else { default_variants +python38 python.default_version 38 @@ -40,10 +43,11 @@ depends_lib-append port:py${python.version}-requests \ port:py${python.version}-requests-toolbelt \ port:py${python.version}-pygments \ port:py${python.version}-socks \ + port:py${python.version}-charset-normalizer \ port:py${python.version}-defusedxml -checksums rmd160 88d227d52199c232c0ddf704a219d1781b1e77ee \ - sha256 00c4b7bbe7f65abe1473f37b39d9d9f8f53f44069a430ad143a404c01c2179fc \ - size 1105185 +checksums rmd160 07b1d1592da1c505ed3ee4ef3b6056215e16e9ff \ + sha256 63cf104bf3552305c68a74f16494a90172b15296610a875e17918e5e36373c0b \ + size 1133491 python.link_binaries_suffix diff --git a/docs/packaging/mac-ports/README.md b/docs/packaging/mac-ports/README.md index aa7ce3b2..2d8170af 100644 --- a/docs/packaging/mac-ports/README.md +++ b/docs/packaging/mac-ports/README.md @@ -13,7 +13,7 @@ We will discuss setting up the environment, installing development tools, instal ## Overall process -Open a pull request to update the [downstream file](https://github.com/macports/macports-ports/blob/master/net/httpie/Portfile) ([example](https://github.com/macports/macports-ports/pull/12167)). +Open a pull request to update the [downstream file](https://github.com/macports/macports-ports/blob/master/net/httpie/Portfile) ([example](https://github.com/macports/macports-ports/pull/12583)). - Here is how to calculate the size and checksums (replace `2.5.0` with the correct version): diff --git a/docs/packaging/spack/README.md b/docs/packaging/spack/README.md index dc20604a..ccd05977 100644 --- a/docs/packaging/spack/README.md +++ b/docs/packaging/spack/README.md @@ -30,20 +30,16 @@ docker run -it --rm spack/centos7 From inside the container: ```bash -# Clone -git clone --depth=1 https://github.com/spack/spack.git -cd spack - # Retrieve the patch of the latest HTTPie version curl https://raw.githubusercontent.com/httpie/httpie/master/docs/packaging/spack/package.py \ - -o var/spack/repos/builtin/packages/httpie/package.py - -# Check the package -spack spec httpie + -o /opt/spack/var/spack/repos/builtin/packages/httpie/package.py # Check available versions (it should show the new version) spack versions httpie +# Check the package +spack spec httpie@XXX + # Install the package spack install httpie@XXX spack load httpie diff --git a/docs/packaging/spack/package.py b/docs/packaging/spack/package.py index b94c0bd6..af5dffc1 100644 --- a/docs/packaging/spack/package.py +++ b/docs/packaging/spack/package.py @@ -7,24 +7,26 @@ from spack import * class Httpie(PythonPackage): - """Modern command line HTTP client.""" + """Modern, user-friendly command-line HTTP client for the API era.""" - homepage = "https://httpie.io/" - pypi = "httpie/httpie-2.5.0.tar.gz" + homepage = 'https://httpie.io/' + pypi = 'httpie/httpie-2.6.0.tar.gz' + maintainers = ['BoboTiG'] + version('2.6.0', sha256='ef929317b239bbf0a5bb7159b4c5d2edbfc55f8a0bcf9cd24ce597daec2afca5') version('2.5.0', sha256='fe6a8bc50fb0635a84ebe1296a732e39357c3e1354541bf51a7057b4877e47f9') - version('0.9.9', sha256='f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb') - version('0.9.8', sha256='515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1') - - variant('socks', default=True, - description='Enable SOCKS proxy support') + version('0.9.9', sha256='f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb', deprecated=True) + version('0.9.8', sha256='515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1', deprecated=True) + depends_on('python@3.6:', when='@2.5:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-defusedxml', type=('build', 'run')) - depends_on('py-pygments', type=('build', 'run')) - depends_on('py-requests', type=('build', 'run')) - depends_on('py-requests-toolbelt', type=('build', 'run')) - depends_on('py-pysocks', type=('build', 'run'), when="+socks") + depends_on('py-charset-normalizer@2:', when='@2.6:', type=('build', 'run')) + depends_on('py-defusedxml@0.6:', when='@2.5:', type=('build', 'run')) + depends_on('py-pygments@2.1.3:', type=('build', 'run')) + depends_on('py-pygments@2.5.2:', when='@2.5:', type=('build', 'run')) + depends_on('py-requests@2.11:', type=('build', 'run')) + depends_on('py-requests@2.22:+socks', when='@2.5:', type=('build', 'run')) + depends_on('py-requests-toolbelt@0.9.1:', when='@2.5:', type=('build', 'run')) # Concretization problem breaks this. Unconditional for now... # https://github.com/spack/spack/issues/3628 # depends_on('py-argparse@1.2.1:', type=('build', 'run'), diff --git a/docs/packaging/windows-chocolatey/httpie.nuspec b/docs/packaging/windows-chocolatey/httpie.nuspec index 39e4810d..48c02146 100644 --- a/docs/packaging/windows-chocolatey/httpie.nuspec +++ b/docs/packaging/windows-chocolatey/httpie.nuspec @@ -2,8 +2,8 @@ httpie - 2.5.0 - Modern, user-friendly command-line HTTP client for the API era. + 2.6.0 + Modern, user-friendly command-line HTTP client for the API era HTTPie *aitch-tee-tee-pie* is a user-friendly command-line HTTP client for the API era. It comes with JSON support, syntax highlighting, persistent sessions, wget-like downloads, plugins, and more. @@ -33,10 +33,10 @@ Main features: https://raw.githubusercontent.com/httpie/httpie/master/LICENSE https://pie-assets.s3.eu-central-1.amazonaws.com/LogoIcons/GB.png false - See the [changelog](https://github.com/httpie/httpie/blob/2.5.0/CHANGELOG.md). + See the [changelog](https://github.com/httpie/httpie/blob/2.6.0/CHANGELOG.md). httpie http https rest api client curl python ssl cli foss oss url https://httpie.io - https://github.com/httpie/httpie + https://github.com/httpie/httpie/tree/master/docs/packaging/windows-chocolatey https://github.com/httpie/httpie https://httpie.io/docs https://github.com/httpie/httpie/issues diff --git a/httpie/__init__.py b/httpie/__init__.py index b5b0447c..1ca8eba5 100644 --- a/httpie/__init__.py +++ b/httpie/__init__.py @@ -1,5 +1,5 @@ """ -HTTPie: command-line HTTP client for the API era. +HTTPie: modern, user-friendly command-line HTTP client for the API era. """