Skip to content

Commit

Permalink
Using python-pkg.sh CI/CD script
Browse files Browse the repository at this point in the history
  • Loading branch information
dmotte committed Dec 14, 2023
1 parent 0854643 commit f0e86ca
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 65 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: main

on:
push: # All branches and tags

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

jobs:
job:
permissions: { contents: write }
uses: dmotte/misc/.github/workflows/cicd-with-script.yml@main
with:
path: $GITHUB_ACTION_PATH/../../scripts/cicd/python-pkg.sh
secrets:
secret01: ${{ secrets.PYPI_API_TOKEN }}
40 changes: 0 additions & 40 deletions .github/workflows/release.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/trivy.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
/venv/

/jctlfmt/__pycache__/
/test/__pycache__/

/build/
/dist/

/*.egg-info/

/.pytest_cache/

/example/step*.txt
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# jctlfmt

[![GitHub main workflow](https://img.shields.io/github/actions/workflow/status/dmotte/jctlfmt/main.yml?branch=main&logo=github&label=main&style=flat-square)](https://github.com/dmotte/jctlfmt/actions)
[![PyPI](https://img.shields.io/pypi/v/jctlfmt?logo=python&style=flat-square)](https://pypi.org/project/jctlfmt/)

:snake: Python **Journalctl parsing** and **formatting** library.
Expand Down
3 changes: 2 additions & 1 deletion jctlfmt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class Entry:
def __init__(self, line: str):
raw = json.loads(line)

# See https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
# For more info about the systemd journal JSON format, see
# https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html

self.datetime = dt.fromtimestamp(int(raw.get(
'_SOURCE_REALTIME_TIMESTAMP',
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ license = MIT

description = Python Journalctl parsing and formatting library
long_description =
[![GitHub main workflow](https://img.shields.io/github/actions/workflow/status/dmotte/jctlfmt/main.yml?branch=main&logo=github&label=main&style=flat-square)](https://github.com/dmotte/jctlfmt/actions)
[![PyPI](https://img.shields.io/pypi/v/jctlfmt?logo=python&style=flat-square)](https://pypi.org/project/jctlfmt/)

Python **Journalctl parsing** and **formatting** library.
Expand All @@ -25,9 +26,7 @@ classifiers =
Programming Language :: Python :: 3.9
Topic :: Utilities

# This version number will be replaced with the current git tag by the
# release.yml workflow
version = 0
version = 0.0.0

[options]
install_requires =
Expand Down

0 comments on commit f0e86ca

Please sign in to comment.