From 23907cda64097bbb3bce1f6b6017642fa29482a4 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 10 Apr 2021 17:00:01 +0300 Subject: [PATCH 1/3] Add documentation and release notes to project_urls --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index 5f2cfed..8d88e12 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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: From 6a4726978a90aa535ff59ebc07cc212769780ef0 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 10 Apr 2021 17:01:50 +0300 Subject: [PATCH 2/3] Fix docstring formatting --- src/humanize/number.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/humanize/number.py b/src/humanize/number.py index d391c2e..0d23a85 100644 --- a/src/humanize/number.py +++ b/src/humanize/number.py @@ -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") From d8f70bb77768655ac6d4029faa0b0422be6c5410 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 10 Apr 2021 20:53:33 +0300 Subject: [PATCH 3/3] Update/simplify config --- .github/workflows/labels.yml | 2 ++ .github/workflows/lint.yml | 29 +++-------------------------- .github/workflows/test.yml | 16 +++++++++------- tox.ini | 2 ++ 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 2303846..e84c13e 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -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 }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 87a1438..6f8c677 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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/action@v2.0.2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 431d3af..d704945 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,6 +2,9 @@ name: Test on: [push, pull_request] +env: + FORCE_COLOR: 1 + jobs: build: runs-on: ${{ matrix.os }} @@ -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 diff --git a/tox.ini b/tox.ini index b961099..1c749a9 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,8 @@ envlist = py{py3, 39, 38, 37, 36} [testenv] +passenv = + FORCE_COLOR extras = tests commands =