Skip to content

Commit 4280bdf

Browse files
dsschultgithub-actions
andauthored
add /data/sim and /data/exp (#4)
* add /data/sim and /data/exp * advance to python 3.12 * update to new setup and toml * fix versions * fix toml syntax * <bot> update pyproject.toml * <bot> update README.md --------- Co-authored-by: github-actions <github-actions@github.com>
1 parent 8dcf356 commit 4280bdf

File tree

7 files changed

+51
-62
lines changed

7 files changed

+51
-62
lines changed

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
ignore = E203,E226,E228,E231,E501,W503,W504

.github/workflows/wipac-cicd.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,38 @@ on:
88
- '**'
99

1010
env:
11-
py_version: '3.10'
11+
py_version: '3.12'
1212

1313
jobs:
1414

1515
flake8:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: actions/setup-python@v4
2020
with:
2121
python-version: ${{ env.py_version }}
22-
- uses: WIPACrepo/wipac-dev-flake8-action@v1.0
22+
- uses: WIPACrepo/wipac-dev-flake8-action@v1.2
2323

2424
py-setup:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929
with:
3030
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
31-
- uses: WIPACrepo/wipac-dev-py-setup-action@v2.5
31+
- uses: WIPACrepo/wipac-dev-py-setup-action@v4.2
32+
with:
33+
python_min: 3.11
3234

3335
py-versions:
3436
runs-on: ubuntu-latest
3537
outputs:
3638
matrix: ${{ steps.versions.outputs.matrix }}
3739
steps:
38-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
3941
- id: versions
40-
uses: WIPACrepo/wipac-dev-py-versions-action@v2.1
42+
uses: WIPACrepo/wipac-dev-py-versions-action@v2.5
4143

4244
pip-install:
4345
needs: [py-versions]
@@ -48,7 +50,7 @@ jobs:
4850
matrix:
4951
version: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
5052
steps:
51-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5254
- uses: actions/setup-python@v4
5355
with:
5456
python-version: ${{ matrix.version }}
@@ -61,7 +63,7 @@ jobs:
6163
runs-on: ubuntu-latest
6264
steps:
6365
- name: Checkout Project
64-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6567
- name: Build Docker Image
6668
uses: docker/build-push-action@v4
6769
with:
@@ -74,7 +76,7 @@ jobs:
7476
runs-on: ubuntu-latest
7577
concurrency: release
7678
steps:
77-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
7880
with:
7981
fetch-depth: 0
8082
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11
1+
FROM python:3.12
22

33
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y attr
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--- Top of README Badges (automated) --->
2-
[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/WIPACrepo/cephfs-disk-usage?include_prereleases)](https://github.com/WIPACrepo/cephfs-disk-usage/) [![Lines of code](https://img.shields.io/tokei/lines/github/WIPACrepo/cephfs-disk-usage)](https://github.com/WIPACrepo/cephfs-disk-usage/) [![GitHub issues](https://img.shields.io/github/issues/WIPACrepo/cephfs-disk-usage)](https://github.com/WIPACrepo/cephfs-disk-usage/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aopen) [![GitHub pull requests](https://img.shields.io/github/issues-pr/WIPACrepo/cephfs-disk-usage)](https://github.com/WIPACrepo/cephfs-disk-usage/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aopen)
2+
[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/WIPACrepo/cephfs-disk-usage?include_prereleases)](https://github.com/WIPACrepo/cephfs-disk-usage/) [![GitHub issues](https://img.shields.io/github/issues/WIPACrepo/cephfs-disk-usage)](https://github.com/WIPACrepo/cephfs-disk-usage/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aopen) [![GitHub pull requests](https://img.shields.io/github/issues-pr/WIPACrepo/cephfs-disk-usage)](https://github.com/WIPACrepo/cephfs-disk-usage/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aopen)
33
<!--- End of README Badges (automated) --->
44
# cephfs-disk-usage
55
CephFS disk usage website

cephfs_disk_usage/server.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ def __init__(self, s3_override=None):
237237
}
238238
else:
239239
kwargs['filesystems'] = {
240+
'/data/sim': CephFileSystem('/data/sim'),
241+
'/data/exp': CephFileSystem('/data/exp'),
240242
'/data/ana': CephFileSystem('/data/ana'),
241243
'/data/user': CephFileSystem('/data/user'),
242244
}

pyproject.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[build-system]
2+
requires = ["setuptools>=61.0"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
version = "0.0.7"
7+
dependencies = ["wipac-rest-tools"]
8+
name = "cephfs-disk-usage"
9+
requires-python = ">=3.11, <3.14"
10+
11+
[project.optional-dependencies]
12+
tests = ["flake8", "pytest", "pytest-asyncio", "pytest-mock"]
13+
14+
[tool.pytest.ini_options]
15+
async = "auto"
16+
17+
[tool.semantic_release]
18+
version_toml = ["pyproject.toml:project.version"]
19+
version_variables = ["cephfs_disk_usage/__init__.py:__version__"]
20+
commit_parser = "emoji"
21+
build_command = "pip install build && python -m build"
22+
23+
[tool.semantic_release.commit_parser_options]
24+
major_tags = ["[major]"]
25+
minor_tags = ["[minor]", "[feature]"]
26+
patch_tags = ["[patch]", "[fix]", " ", "!", "#", "$", "%", "&", "'", "(", ")", "*", "+", "-", ".", "/", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ":", ";", "<", "=", ">", "?", "@", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "[", "]", "^", "_", "`", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "{", "|", "}", "~"]
27+
28+
[tool.setuptools.package-data]
29+
"*" = ["py.typed"]
30+
31+
[tool.setuptools.packages.find]
32+
namespaces = false
33+
exclude = ["test", "tests", "doc", "docs", "resource", "resources", "example", "examples"]

setup.cfg

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

0 commit comments

Comments
 (0)