Skip to content

Commit 9b080ef

Browse files
authored
Merge pull request #6 from sarnold/more-readme
readme cleanup
2 parents 8c4c6a1 + 55df72f commit 9b080ef

File tree

2 files changed

+44
-24
lines changed

2 files changed

+44
-24
lines changed

.github/workflows/containers.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
get_version:
1212
name: Get version info
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
permissions:
1515
contents: read
1616
defaults:
@@ -45,8 +45,19 @@ jobs:
4545
include:
4646
- image: debian:bookworm
4747
pkgs: python3.11-venv
48+
py3: python3
4849
- image: debian:sid
4950
pkgs: python3.13-venv
51+
py3: python3
52+
- image: fedora:latest
53+
pkgs: python3-devel python3-pip
54+
py3: python3
55+
- image: rockylinux:9
56+
pkgs: python3-devel python3-pip
57+
py3: python3
58+
- image: fedora:rawhide
59+
pkgs: python3.13 python3-pip
60+
py3: python3.13
5061

5162
runs-on: ubuntu-latest
5263
needs: [get_version]
@@ -87,7 +98,16 @@ jobs:
8798
if: (startsWith(matrix.image, 'roc') || startsWith(matrix.image, 'fed'))
8899
run: |
89100
dnf search --refresh epel
90-
dnf install -y git wget sudo python3-devel python3-pip
101+
dnf install -y git wget sudo libcap ${{matrix.pkgs}} rpm-build
102+
103+
- name: Setup python (rawhide only)
104+
if: matrix.image == 'fedora:rawhide'
105+
run: |
106+
sudo ln -sf /usr/bin/python3.13 /usr/bin/python3
107+
sudo alternatives --install /usr/bin/python python /usr/bin/python3.13 2
108+
sudo alternatives --install /usr/bin/python python /usr/bin/python3.14 1
109+
alternatives --help
110+
python --version
91111
92112
- name: Manually create pip cache dir
93113
run: mkdir -p ~/.cache/pip
@@ -104,7 +124,7 @@ jobs:
104124
105125
- name: Install dependencies
106126
run: |
107-
python3 -m venv .venv
127+
${{matrix.py3}} -m venv .venv
108128
.venv/bin/pip3 install --upgrade pip wheel setuptools
109129
.venv/bin/pip3 install tox
110130

README.rst

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ dependencies and run the specified commands, eg:
112112

113113
::
114114

115-
$ git clone https://github.com/sarnold/doorstop-to-mermaid
116-
$ cd doorstop-to-mermaid/
115+
$ git clone https://github.com/sarnold/simple-python-project
116+
$ cd simple-python-project/
117117
$ tox -e py
118118

119119
The above will run the default test command using the (local) default
@@ -177,8 +177,8 @@ something like::
177177

178178
then install it into the repo you just cloned::
179179

180-
$ git clone [email protected]:sarnold/doorstop-to-mermaid.git
181-
$ cd radar-test-gui/
180+
$ git clone [email protected]:sarnold/simple-python-project.git
181+
$ cd simple-python-project/
182182
$ pre-commit install
183183

184184
It's usually a good idea to update the hooks to the latest version::
@@ -227,40 +227,40 @@ specifications.
227227
.. _setuptools_scm: https://setuptools-scm.readthedocs.io/en/stable/
228228

229229

230-
.. |ci| image:: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/ci.yml/badge.svg
231-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/ci.yml
230+
.. |ci| image:: https://github.com/sarnold/simple-python-project/actions/workflows/ci.yml/badge.svg
231+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/ci.yml
232232
:alt: CI Status
233233

234-
.. |wheels| image:: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/wheels.yml/badge.svg
235-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/wheels.yml
234+
.. |wheels| image:: https://github.com/sarnold/simple-python-project/actions/workflows/wheels.yml/badge.svg
235+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/wheels.yml
236236
:alt: Wheel Status
237237

238-
.. |badge| image:: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/pylint.yml/badge.svg
239-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/pylint.yml
238+
.. |badge| image:: https://github.com/sarnold/simple-python-project/actions/workflows/pylint.yml/badge.svg
239+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/pylint.yml
240240
:alt: Pylint Status
241241

242-
.. |release| image:: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/release.yml/badge.svg
243-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/release.yml
242+
.. |release| image:: https://github.com/sarnold/simple-python-project/actions/workflows/release.yml/badge.svg
243+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/release.yml
244244
:alt: Release Status
245245

246-
.. |bandit| image:: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/bandit.yml/badge.svg
247-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/bandit.yml
246+
.. |bandit| image:: https://github.com/sarnold/simple-python-project/actions/workflows/bandit.yml/badge.svg
247+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/bandit.yml
248248
:alt: Security check - Bandit
249249

250-
.. |cov| image:: https://raw.githubusercontent.com/sarnold/doorstop-to-mermaid/badges/main/test-coverage.svg
251-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/coverage.yml
250+
.. |cov| image:: https://raw.githubusercontent.com/sarnold/simple-python-project/badges/main/test-coverage.svg
251+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/coverage.yml
252252
:alt: Test coverage
253253

254-
.. |pylint| image:: https://raw.githubusercontent.com/sarnold/doorstop-to-mermaid/badges/main/pylint-score.svg
255-
:target: https://github.com/sarnold/doorstop-to-mermaid/actions/workflows/pylint.yml
254+
.. |pylint| image:: https://raw.githubusercontent.com/sarnold/simple-python-project/badges/main/pylint-score.svg
255+
:target: https://github.com/sarnold/simple-python-project/actions/workflows/pylint.yml
256256
:alt: Pylint Score
257257

258258
.. |license| image:: https://img.shields.io/badge/license-MIT-blue
259-
:target: https://github.com/sarnold/doorstop-to-mermaid/blob/main/LICENSE
259+
:target: https://github.com/sarnold/simple-python-project/blob/main/LICENSE
260260
:alt: License
261261

262-
.. |tag| image:: https://img.shields.io/github/v/tag/sarnold/doorstop-to-mermaid?color=green&include_prereleases&label=latest%20release
263-
:target: https://github.com/sarnold/doorstop-to-mermaid/releases
262+
.. |tag| image:: https://img.shields.io/github/v/tag/sarnold/simple-python-project?color=green&include_prereleases&label=latest%20release
263+
:target: https://github.com/sarnold/simple-python-project/releases
264264
:alt: GitHub tag
265265

266266
.. |python| image:: https://img.shields.io/badge/python-3.9+-blue.svg

0 commit comments

Comments
 (0)