Skip to content

Commit 6bbef0a

Browse files
vavsabclaude
andcommitted
fix(#868k5bbdr): Fix CI, rename to diskcache3, consolidate workflows
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 7efeb41 commit 6bbef0a

5 files changed

Lines changed: 43 additions & 105 deletions

File tree

.github/workflows/integration.yml

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: integration
1+
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
45

56
jobs:
6-
77
checks:
88
runs-on: ubuntu-latest
99
strategy:
@@ -12,41 +12,53 @@ jobs:
1212
check: [bluecheck, doc8, docs, flake8, isortcheck, mypy, pylint, rstcheck]
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: '3.11'
20-
- name: Install dependencies
21-
run: |
22-
pip install --upgrade pip
23-
pip install tox
24-
- name: Run checks with tox
25-
run: |
26-
tox -e ${{ matrix.check }}
20+
- name: Install tox
21+
run: pip install tox
22+
- name: Run checks
23+
run: tox -e ${{ matrix.check }}
2724

2825
tests:
2926
needs: checks
30-
runs-on: ${{ matrix.os }}
27+
runs-on: ubuntu-latest
3128
strategy:
32-
max-parallel: 8
29+
max-parallel: 4
3330
matrix:
34-
os: [ubuntu-latest, macos-latest, windows-latest]
35-
python-version: [3.8, 3.9, '3.10', 3.11]
31+
python-version: ['3.9', '3.10', '3.11', '3.12']
3632

3733
steps:
38-
- name: Set up Python ${{ matrix.python-version }} x64
39-
uses: actions/setup-python@v4
34+
- uses: actions/checkout@v4
35+
- name: Set up Python ${{ matrix.python-version }}
36+
uses: actions/setup-python@v5
4037
with:
4138
python-version: ${{ matrix.python-version }}
42-
architecture: x64
39+
- name: Install tox
40+
run: pip install tox
41+
- name: Run tests
42+
run: tox -e py
4343

44-
- uses: actions/checkout@v3
44+
publish:
45+
needs: tests
46+
if: startsWith(github.ref, 'refs/tags/v')
47+
runs-on: ubuntu-latest
48+
permissions:
49+
contents: read
4550

46-
- name: Install tox
51+
steps:
52+
- uses: actions/checkout@v4
53+
- name: Set up Python
54+
uses: actions/setup-python@v5
55+
with:
56+
python-version: '3.11'
57+
- name: Build package
4758
run: |
48-
pip install --upgrade pip
49-
pip install tox
50-
51-
- name: Test with tox
52-
run: tox -e py
59+
pip install build
60+
python -m build
61+
- name: Publish to PyPI
62+
uses: pypa/gh-action-pypi-publish@release/v1
63+
with:
64+
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/publish.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.pylintrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ source-roots=
101101

102102
# When enabled, pylint would attempt to guess common misconfiguration and emit
103103
# user-friendly hints instead of false-positive error messages.
104-
suggestion-mode=yes
104+
# suggestion-mode removed (pylint 4.x dropped this option)
105105

106106
# Allow loading of arbitrary C extensions. Extensions are imported into the
107107
# active Python interpreter and may run arbitrary code.
@@ -433,7 +433,9 @@ disable=raw-checker-failed,
433433
no-member,
434434
no-else-return,
435435
no-else-raise,
436-
inconsistent-return-statements
436+
inconsistent-return-statements,
437+
too-many-lines,
438+
too-many-positional-arguments
437439

438440
# Enable the message, report, category or checker with the given id(s). You can
439441
# either give multiple identifier separated by comma (,) or put this option

diskcache/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# Django not installed or not setup so ignore.
6565
pass
6666

67-
__title__ = 'mapped-diskcache'
67+
__title__ = 'diskcache3'
6868
__version__ = '6.0.0'
6969
__build__ = 0x060000
7070
__author__ = 'Grant Jenks'

0 commit comments

Comments
 (0)