From 1ea92c8ca3d56224255ff37dc24173ca263542a0 Mon Sep 17 00:00:00 2001 From: Rarylson Freitas Date: Fri, 21 Oct 2022 11:02:52 -0300 Subject: [PATCH] Minor fixes in the publishing process Fixes are: - Update badges in `README.md` - Fix `pip search` as it's deprecated - See: https://github.com/pypa/pip/issues/5216 --- .github/workflows/test.yml | 4 +++- Makefile | 5 +++-- README.md | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac003e3..ab5ae09 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,3 +1,5 @@ +name: tests + on: push: branches: ["master"] @@ -5,7 +7,7 @@ on: branches: ["master"] jobs: - test: + tests: runs-on: ubuntu-latest strategy: matrix: diff --git a/Makefile b/Makefile index acd1b95..7071f95 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ develop-deps-macos: install-develop: virtualenv $(VENV) + . $(VENV)/bin/activate && pip install --upgrade pip . $(VENV)/bin/activate && pip install -r requirements-dev.txt . $(VENV)/bin/activate && python setup.py develop @@ -114,10 +115,10 @@ publish-github: git push origin "v$(VERSION)" check-publish-test: - pip search --index https://testpypi.python.org/pypi/ $(NAME) | grep -o $(VERSION) + pip index versions --index https://testpypi.python.org/pypi/ $(NAME) | grep -o "Available versions: $(VERSION)" check-publish: - pip search $(NAME) | grep -o $(VERSION) + pip index versions $(NAME) | grep -o "Available versions: $(VERSION)" publish-test: publish-pypitest check-publish-test diff --git a/README.md b/README.md index 1644ae5..a38f417 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ update-conf.py ============== -[![GitHub Workflow - Build Status](https://github.com/github/docs/actions/workflows/test.yml/badge.svg?branch=master)](https://travis-ci.org/rarylson/update-conf.py) -[![Coveralls - Coverage Percentage](https://img.shields.io/coveralls/rarylson/update-conf.py/master.svg)](https://coveralls.io/r/rarylson/update-conf.py) -[![Pypi - Downloads](https://img.shields.io/pypi/dm/update-conf.py.svg)](https://pypi.python.org/pypi/update-conf.py/) -[![Pypi - Version](https://img.shields.io/pypi/v/update-conf.py.svg)](https://pypi.python.org/pypi/update-conf.py/) +[![Test Status](https://github.com/rarylson/update-conf.py/actions/workflows/tests/badge.svg?branch=master&event=push)](https://github.com/rarylson/update-conf.py/actions/workflows/test.yml) +[![Coverage Status](https://coveralls.io/repos/github/rarylson/update-conf.py/badge.svg?branch=master)](https://coveralls.io/github/rarylson/update-conf.py?branch=master) +[![PyPI - Downloads](https://img.shields.io/pypi/dm/update-conf.py.svg)](https://pypi.python.org/pypi/update-conf.py/) +[![PyPI - Version](https://img.shields.io/pypi/v/update-conf.py.svg)](https://pypi.python.org/pypi/update-conf.py/) [![License](https://img.shields.io/pypi/l/update-conf.py.svg)](LICENSE) Generate config files from `conf.d` like directories.