Skip to content

Commit b0dea95

Browse files
authored
Merge pull request #74 from codrsquad/reviewed-reqs-constraints
Updated requirements constraints
2 parents 67e24fb + 4f0ced1 commit b0dea95

File tree

7 files changed

+49
-33
lines changed

7 files changed

+49
-33
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ jobs:
1414
id-token: write # mandatory for trusted publishing
1515

1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-python@v5
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-python@v6
1919
with:
20-
python-version: "3.11"
21-
22-
- run: pip install -U pip setuptools wheel tox
23-
- run: tox -e py,docs,style
24-
- run: python setup.py sdist bdist_wheel
20+
python-version: "3.14"
2521

22+
- uses: astral-sh/setup-uv@v7
23+
- run: uvx --with tox-uv tox -e py,docs,style
24+
- run: uv build
2625
- name: Publish to PyPI
2726
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,54 @@ on:
66
pull_request:
77
branches: [ main ]
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
test:
11-
15+
name: Test py${{ matrix.python-version }}
1216
runs-on: ubuntu-latest
1317

1418
strategy:
19+
fail-fast: false
1520
matrix:
1621
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1722

1823
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-python@v5
24+
- uses: actions/checkout@v6
25+
- uses: actions/setup-python@v6
2126
with:
2227
python-version: ${{ matrix.python-version }}
2328

24-
- run: pip install -U pip tox
25-
- run: tox -e py
26-
- uses: codecov/codecov-action@v3
29+
- uses: astral-sh/setup-uv@v7
30+
- run: uvx --with tox-uv tox -e py
31+
32+
- uses: coverallsapp/github-action@v2
33+
with:
34+
file: .tox/test-reports/coverage.xml
35+
flag-name: python-${{ matrix.python-version }}
36+
parallel: true
37+
38+
coveralls-finish:
39+
name: Finish Coveralls
40+
needs: [test]
41+
runs-on: ubuntu-latest
42+
steps:
43+
- name: Finish parallel build
44+
uses: coverallsapp/github-action@v2
2745
with:
28-
files: .tox/test-reports/coverage.xml
46+
parallel-finished: true
2947

3048
linters:
3149

3250
runs-on: ubuntu-latest
3351

3452
steps:
35-
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v5
53+
- uses: actions/checkout@v6
54+
- uses: actions/setup-python@v6
3755
with:
38-
python-version: "3.11"
56+
python-version: "3.14"
3957

40-
- run: pip install -U pip tox
41-
- run: tox -e docs,style
58+
- uses: astral-sh/setup-uv@v7
59+
- run: uvx --with tox-uv tox -e docs,style

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Portable python binaries
99
:target: https://github.com/codrsquad/portable-python/actions
1010
:alt: Tested with Github Actions
1111

12-
.. image:: https://codecov.io/gh/codrsquad/portable-python/branch/main/graph/badge.svg
13-
:target: https://codecov.io/gh/codrsquad/portable-python
12+
.. image:: https://coveralls.io/repos/github/codrsquad/portable-python/badge.svg?branch=main
13+
:target: https://coveralls.io/github/codrsquad/portable-python?branch=main
1414
:alt: Test coverage
1515

1616
.. image:: https://img.shields.io/pypi/pyversions/portable-python.svg

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
click~=8.0
2-
pyyaml~=6.0
3-
requests<3.0
4-
runez~=5.5
5-
urllib3~=1.26
1+
click<9
2+
pyyaml<7
3+
requests<3
4+
runez<6
5+
urllib3<3

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name="portable-python",
5-
setup_requires="setupmeta",
5+
setup_requires=["setupmeta"],
66
versioning="dev",
77
author="Zoran Simic zoran@simicweb.com",
88
keywords="python, portable, binary",

tests/conftest.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
import runez
2-
from runez.conftest import cli, logged, temp_folder
2+
from runez.conftest import cli, ClickRunner, logged, temp_folder # noqa: F401, fixtures
33
from runez.http import GlobalHttpCalls
44

55
from portable_python.cli import main
66

77
GlobalHttpCalls.forbid()
88

9-
# These are fixtures, satisfying linters with an assert
10-
assert logged
11-
assert temp_folder
12-
139
# Ensure common logging setup is done throughout all tests (even tests not invoking cli)
1410
runez.log.setup(debug=True, console_format="%(levelname)s %(message)s", locations=None)
1511

16-
cli.default_main = main
12+
ClickRunner.default_main = main
1713

1814

1915
def dummy_tarball(folders, basename, content=None):

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ deps = ruff
3030
commands = ruff check --fix
3131
ruff format
3232

33+
# Old check-manifest + readme-renderer, see if there's better out there nowadays
3334
[testenv:docs]
3435
skip_install = True
3536
deps = check-manifest
3637
readme-renderer
38+
pip
39+
setuptools
3740
commands = check-manifest
3841
python setup.py check --strict --restructuredtext
3942

0 commit comments

Comments
 (0)