Skip to content

Commit 6d1385c

Browse files
committed
Merge branch 'main' into develop
2 parents d6aae15 + 5895765 commit 6d1385c

7 files changed

+102
-16
lines changed

.github/workflows/codeql-analysis.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
# For most projects, this workflow file will not need changing; you simply need
3+
# to commit it to your repository.
4+
#
5+
# You may wish to alter this file to override the set of languages analyzed,
6+
# or to provide custom queries or build logic.
7+
#
8+
# ******** NOTE ********
9+
# We have attempted to detect the languages in your repository. Please check
10+
# the `language` matrix defined below to confirm you have the correct set of
11+
# supported CodeQL languages.
12+
#
13+
name: "CodeQL"
14+
on: # yamllint disable-line rule:truthy
15+
push:
16+
branches:
17+
- main
18+
- develop
19+
pull_request:
20+
branches:
21+
- main
22+
- develop
23+
24+
jobs:
25+
analyze:
26+
name: Analyze
27+
runs-on: ubuntu-latest
28+
29+
steps:
30+
- name: Checkout repository
31+
uses: actions/checkout@v2
32+
33+
- name: Initialize CodeQL
34+
uses: github/codeql-action/init@v1
35+
with:
36+
languages: python
37+
38+
- name: Autobuild
39+
uses: github/codeql-action/autobuild@v1
40+
41+
- name: Perform CodeQL Analysis
42+
uses: github/codeql-action/analyze@v1
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: GitGuardian scan
3+
on: # yamllint disable-line rule:truthy
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
scanning:
9+
name: GitGuardian scan
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
16+
17+
- name: GitGuardian scan
18+
uses: GitGuardian/gg-shield-action@master
19+
env:
20+
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
21+
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
22+
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
23+
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
24+
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

.github/workflows/yaml-lint.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Yaml Lint
3+
on: # yamllint disable-line rule:truthy
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
yamllint:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v1
13+
14+
- name: YAML Lint and Annotate
15+
uses: Staffbase/[email protected]
16+
with:
17+
token: ${{ secrets.GITHUB_TOKEN }}
18+
## The target path is processed recursively
19+
target-path: .

.pre-commit-config.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
---
2-
repos:
3-
- repo: https://github.com/adrienverge/yamllint.git
4-
sha: v1.26.3
5-
hooks:
6-
- id: yamllint
7-
- repo: https://github.com/PyCQA/flake8
8-
rev: 5.0.4
9-
hooks:
10-
- id: flake8
11-
args: [--max-line-length=150]
1+
---
2+
repos:
3+
- repo: https://github.com/adrienverge/yamllint.git
4+
sha: v1.26.3
5+
hooks:
6+
- id: yamllint
7+
- repo: https://github.com/PyCQA/flake8
8+
rev: 5.0.4
9+
hooks:
10+
- id: flake8
11+
args: [--max-line-length=150]

CONTRIBUTING.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ Reading and following these guidelines will help me make the contribution proces
77
## Quicklinks
88

99
- [Contributing to pynipper-ng](#contributing-to-pynipper-ng)
10+
- [Quicklinks](#quicklinks)
1011
- [Code of Conduct](#code-of-conduct)
1112
- [Getting Started](#getting-started)
1213
- [Issues](#issues)
1314
- [Pull Requests](#pull-requests)
1415
- [Core changes](#core-changes)
15-
- [Implement a new device](#new-device)
16-
- [Implement a new plugin](#new-plugin)
16+
- [New device](#new-device)
17+
- [New plugin](#new-plugin)
18+
- [Doubts or issues contributing](#doubts-or-issues-contributing)
19+
>>>>>>> main
1720
1821
## Code of Conduct
1922

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# pynipper-ng 🔧
22

3-
_Repository stats:_
4-
53
[![Documentation Status](https://readthedocs.org/projects/pynipper-ng/badge/?version=latest)](https://pynipper-ng.readthedocs.io/?badge=latest)
64
![Latest release](https://img.shields.io/github/v/release/syn-4ck/pynipper-ng)
75
![Latest release date](https://img.shields.io/github/release-date/syn-4ck/pynipper-ng)

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ click==8.1.7
77
# Used to fix vulnerability in requests package
88
certifi==2024.8.30
99
# Used to fix vulnerability in click package
10-
zipp==3.19.1
10+
zipp==3.19.1

0 commit comments

Comments
 (0)