Skip to content

Commit 1759ab4

Browse files
jelmerkyllikki
authored andcommitted
Import Debian changes 10.0-3
humanfriendly (10.0-3) unstable; urgency=medium . [ Debian Janitor ] * Apply multi-arch hints. + python-humanfriendly-doc: Add Multi-Arch: foreign. . humanfriendly (10.0-2) unstable; urgency=medium . * Team upload. * Use unittest instead of pytest (Closes: #1013705) * Switch to debhelper-compat 13 * Use dh-sequence-python3 * Bump Standards-Version to 4.6.1, no changes * dh_missing: ignore pycache . humanfriendly (10.0-1) unstable; urgency=medium . * New upstream release * debian/copyright - update upstream copyright notice - add my contribution
2 parents f4d8e7c + 7c4d675 commit 1759ab4

25 files changed

+217
-88
lines changed

.github/workflows/test.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Test
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
FORCE_COLOR: 1
7+
8+
jobs:
9+
build:
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10-dev", "pypy3"]
15+
os: [ubuntu-latest]
16+
include:
17+
- { python-version: "3.7", os: macos-latest }
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v2
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Get pip cache dir
28+
id: pip-cache
29+
run: |
30+
echo "::set-output name=dir::$(pip cache dir)"
31+
32+
- name: Cache
33+
uses: actions/cache@v2
34+
with:
35+
path: ${{ steps.pip-cache.outputs.dir }}
36+
key:
37+
${{ matrix.os }}-${{ matrix.python-version }}-v1-${{
38+
hashFiles('**/setup.py') }}
39+
restore-keys: |
40+
${{ matrix.os }}-${{ matrix.python-version }}-v1-
41+
42+
- name: Install dependencies
43+
run: |
44+
python -m pip install -U pip
45+
python -m pip install -U setuptools virtualenv
46+
python -m pip install -U --requirement=requirements-travis.txt
47+
python -m pip install .
48+
49+
- name: Tests
50+
run: |
51+
make check
52+
make test
53+
54+
- name: Upload coverage
55+
uses: codecov/codecov-action@v1
56+
with:
57+
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.pyc
33
.coverage
44
.coverage.*
5+
.tox
56
__pycache__/
67
dist/*.tar.gz
78
dist/*.zip

.travis.yml

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

CHANGELOG.rst

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,57 @@ Changelog`_. This project adheres to `semantic versioning`_.
1111
.. _Keep a Changelog: http://keepachangelog.com/
1212
.. _semantic versioning: http://semver.org/
1313

14+
`Release 10.0`_ (2021-09-17)
15+
----------------------------
16+
17+
**Noteworthy changes:**
18+
19+
- Merged pull request `#45`_ to resolve the issue caused by the conditional
20+
:pypi:`pyreadline` requirement on Windows not supporting Python 3.9+.
21+
22+
- Updated the readme to use Python 3 in the example (reported in issue `#56`_).
23+
Also added a mention of the ``humanfriendly --demo`` command.
24+
25+
- Removed the ``humanfriendly.compat.unittest`` alias that presumably no-one is
26+
using at this point; it had been rendered useless quite a long time ago
27+
(requested in issue `#53`_).
28+
29+
**Internal changes:**
30+
31+
- Merged pull request `#54`_ which migrates the :pypi:`humanfriendly` project
32+
from Travis CI to GitHub Actions and from Coveralls.io to Codecov.
33+
34+
- Fixed a deprecation warning concerning ``setup.cfg`` and some Sphinx
35+
documentation errors.
36+
37+
.. _Release 10.0: https://github.com/xolox/python-humanfriendly/compare/9.2...10.0
38+
.. _#45: https://github.com/xolox/python-humanfriendly/pull/45
39+
.. _#53: https://github.com/xolox/python-humanfriendly/issues/53
40+
.. _#54: https://github.com/xolox/python-humanfriendly/pull/54
41+
.. _#56: https://github.com/xolox/python-humanfriendly/issues/56
42+
43+
`Release 9.2`_ (2021-06-11)
44+
---------------------------
45+
46+
Maintenance release:
47+
48+
- Merged pull request `#46`_ which fixes several :pypi:`flake8` warnings.
49+
50+
- Merged pull request `#49`_ which marks Python 3.9 support final.
51+
52+
- Merged pull request `#51`_ which helps to stabilize the test suite.
53+
54+
- Merged pull request `#52`_ which updates the :mod:`humanfriendly.sphinx`
55+
module to include Sphinx extension metadata that has become mandatory in a
56+
recent Sphinx release. After merging the pull request I added additional
57+
metadata including the version.
58+
59+
.. _Release 9.2: https://github.com/xolox/python-humanfriendly/compare/9.1...9.2
60+
.. _#46: https://github.com/xolox/python-humanfriendly/pull/46
61+
.. _#49: https://github.com/xolox/python-humanfriendly/pull/49
62+
.. _#51: https://github.com/xolox/python-humanfriendly/pull/51
63+
.. _#52: https://github.com/xolox/python-humanfriendly/pull/52
64+
1465
`Release 9.1`_ (2020-12-10)
1566
---------------------------
1667

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2020 Peter Odding
1+
Copyright (c) 2021 Peter Odding
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

README.rst

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
humanfriendly: Human friendly input/output in Python
22
====================================================
33

4-
.. image:: https://travis-ci.org/xolox/python-humanfriendly.svg?branch=master
5-
:target: https://travis-ci.org/xolox/python-humanfriendly
4+
.. image:: https://github.com/xolox/python-humanfriendly/actions/workflows/test.yml/badge.svg?branch=master
5+
:target: https://github.com/xolox/python-humanfriendly/actions
66

7-
.. image:: https://coveralls.io/repos/github/xolox/python-humanfriendly/badge.svg?branch=master
8-
:target: https://coveralls.io/github/xolox/python-humanfriendly?branch=master
7+
.. image:: https://codecov.io/gh/xolox/python-humanfriendly/branch/master/graph/badge.svg?token=jYaj4T74TU
8+
:target: https://codecov.io/gh/xolox/python-humanfriendly
99

1010
The functions and classes in the `humanfriendly` package can be used to make
1111
text interfaces more user friendly. Some example features:
@@ -19,7 +19,7 @@ text interfaces more user friendly. Some example features:
1919
- Prompting the user to select a choice from a list of options by typing the
2020
option's number or a unique substring of the option.
2121

22-
- Terminal interaction including text styling (ANSI escape sequences), user
22+
- Terminal interaction including text styling (`ANSI escape sequences`_), user
2323
friendly rendering of usage messages and querying the terminal for its
2424
size.
2525

@@ -35,17 +35,25 @@ Getting started
3535

3636
It's very simple to start using the `humanfriendly` package::
3737

38-
>>> import humanfriendly
39-
>>> user_input = raw_input("Enter a readable file size: ")
40-
Enter a readable file size: 16G
41-
>>> num_bytes = humanfriendly.parse_size(user_input)
42-
>>> print num_bytes
38+
>>> from humanfriendly import format_size, parse_size
39+
>>> from humanfriendly.prompts import prompt_for_input
40+
>>> user_input = prompt_for_input("Enter a readable file size: ")
41+
42+
Enter a readable file size: 16G
43+
44+
>>> num_bytes = parse_size(user_input)
45+
>>> print(num_bytes)
4346
16000000000
44-
>>> print "You entered:", humanfriendly.format_size(num_bytes)
47+
>>> print("You entered:", format_size(num_bytes))
4548
You entered: 16 GB
46-
>>> print "You entered:", humanfriendly.format_size(num_bytes, binary=True)
49+
>>> print("You entered:", format_size(num_bytes, binary=True))
4750
You entered: 14.9 GiB
4851

52+
To get a demonstration of supported terminal text styles (based on
53+
`ANSI escape sequences`_) you can run the following command::
54+
55+
$ humanfriendly --demo
56+
4957
Command line
5058
------------
5159

@@ -144,12 +152,13 @@ License
144152

145153
This software is licensed under the `MIT license`_.
146154

147-
© 2020 Peter Odding.
155+
© 2021 Peter Odding.
148156

149157
.. External references:
150158
.. _#4: https://github.com/xolox/python-humanfriendly/issues/4
151159
.. _#8: https://github.com/xolox/python-humanfriendly/pull/8
152160
.. _#9: https://github.com/xolox/python-humanfriendly/pull/9
161+
.. _ANSI escape sequences: https://en.wikipedia.org/wiki/ANSI_escape_code
153162
.. _changelog: https://humanfriendly.readthedocs.io/en/latest/changelog.html
154163
.. _colorama: https://pypi.org/project/colorama
155164
.. _format_size(): https://humanfriendly.readthedocs.io/en/latest/#humanfriendly.format_size

debian/changelog

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
humanfriendly (10.0-3) unstable; urgency=medium
2+
3+
[ Debian Janitor ]
4+
* Apply multi-arch hints. + python-humanfriendly-doc: Add Multi-Arch: foreign.
5+
6+
-- Jelmer Vernooij <[email protected]> Sun, 16 Oct 2022 18:17:57 +0100
7+
8+
humanfriendly (10.0-2) unstable; urgency=medium
9+
10+
* Team upload.
11+
* Use unittest instead of pytest (Closes: #1013705)
12+
* Switch to debhelper-compat 13
13+
* Use dh-sequence-python3
14+
* Bump Standards-Version to 4.6.1, no changes
15+
* dh_missing: ignore pycache
16+
17+
-- Luca Boccassi <[email protected]> Fri, 29 Jul 2022 12:48:05 +0100
18+
19+
humanfriendly (10.0-1) unstable; urgency=medium
20+
21+
* New upstream release
22+
* debian/copyright
23+
- update upstream copyright notice
24+
- add my contribution
25+
26+
-- Sandro Tosi <[email protected]> Sat, 09 Oct 2021 21:16:56 -0400
27+
128
humanfriendly (9.1-1) unstable; urgency=medium
229

330
[ Ondřej Nový ]

debian/control

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Priority: optional
44
Maintainer: Debian Python Team <[email protected]>
55
Uploaders: Gaurav Juvekar <[email protected]>,
66
Sandro Tosi <[email protected]>,
7-
Build-Depends: debhelper-compat (= 12),
7+
Build-Depends: debhelper-compat (= 13),
88
dh-python,
9+
dh-sequence-python3,
910
python3-all,
1011
python3-coloredlogs <!nocheck>,
1112
python3-docutils <!nocheck>,
1213
python3-mock <!nocheck>,
13-
python3-pytest <!nocheck>,
1414
python3-setuptools,
1515
python3-sphinx <!nodoc>,
16-
Standards-Version: 4.5.1
16+
Standards-Version: 4.6.1
1717
Rules-Requires-Root: no
1818
Vcs-Browser: https://salsa.debian.org/python-team/packages/humanfriendly
1919
Vcs-Git: https://salsa.debian.org/python-team/packages/humanfriendly.git
@@ -41,6 +41,7 @@ Architecture: all
4141
Section: doc
4242
Depends: ${misc:Depends},
4343
${sphinxdoc:Depends},
44+
Multi-Arch: foreign
4445
Description: Python3 library to make user friendly text interfaces - Documentation
4546
A Python3 library that can be used to make text interfaces more user friendly.
4647
It provides parsing and formatting numbers, file sizes, pathnames and

debian/copyright

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ Upstream-Contact: Peter Odding <[email protected]>
44
Source: https://humanfriendly.readthedocs.io
55

66
Files: *
7-
Copyright: (c) 2020 Peter Odding <[email protected]>
7+
Copyright: (c) 2021 Peter Odding <[email protected]>
88
License: Expat
99

1010
Files: debian/*
1111
Copyright: 2017 © Gaurav Juvekar <[email protected]>
12+
2020-2021 Sandro Tosi <[email protected]>
1213
License: Expat
1314

1415
License: Expat

debian/not-installed

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/lib/*/dist-packages/humanfriendly/__pycache__/
2+
usr/lib/*/dist-packages/humanfriendly/terminal/__pycache__/

0 commit comments

Comments
 (0)