Skip to content

Commit

Permalink
Merge pull request #196 from hugovk/config-update
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored Apr 11, 2021
2 parents 0ab8e76 + d8f70bb commit 514d817
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 34 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: micnncim/action-label-syncer@v1
with:
prune: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29 changes: 3 additions & 26 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,10 @@ name: Lint
on: [push, pull_request]

jobs:
build:
lint:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2

- name: Cache
uses: actions/cache@v2
with:
path: |
~/.cache/pip
~/.cache/pre-commit
key: lint-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/.pre-commit-config.yaml') }}
restore-keys: |
lint-
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U tox
- name: Lint
run: tox -e lint
env:
PRE_COMMIT_COLOR: always
- uses: actions/setup-python@v2
- uses: pre-commit/[email protected]
16 changes: 9 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Test

on: [push, pull_request]

env:
FORCE_COLOR: 1

jobs:
build:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -29,24 +32,23 @@ jobs:
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
- name: Cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key:
${{ matrix.os }}-${{ matrix.python-version }}-v2-${{
${{ matrix.os }}-${{ matrix.python-version }}-v1-${{
hashFiles('**/setup.py') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.python-version }}-v2-
${{ matrix.os }}-${{ matrix.python-version }}-v1-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade wheel
python -m pip install --upgrade tox
python -m pip install -U pip
python -m pip install -U wheel
python -m pip install -U tox
- name: Tox tests
shell: bash
run: |
tox -e py
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ project_urls =
Source=https://github.com/jmoiron/humanize
Issue tracker=https://github.com/jmoiron/humanize/issues
Funding=https://tidelift.com/subscription/pkg/pypi-humanize?utm_source=pypi-humanize&utm_medium=pypi
Documentation=https://python-humanize.readthedocs.io/
Release notes=https://github.com/jmoiron/humanize/releases

[options]
packages = find:
Expand Down
2 changes: 1 addition & 1 deletion src/humanize/number.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def intcomma(value, ndigits=None):
compatibility with Django's `intcomma`, this function also accepts floats.
Examples:
``pycon
```pycon
>>> intcomma(100)
'100'
>>> intcomma("1000")
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ envlist =
py{py3, 39, 38, 37, 36}

[testenv]
passenv =
FORCE_COLOR
extras =
tests
commands =
Expand Down

0 comments on commit 514d817

Please sign in to comment.