Skip to content

Commit

Permalink
V1.3.0a (#42)
Browse files Browse the repository at this point in the history
* 1) dev dependencies added to pyproject.toml
2) requirements.txt generated after pyproject.toml

* global METADATA dictionary partially re-created

* globals.py substituted by metadata.py

* all metadata treated

* ELEMENT_VIEW_TYPES treated

* performance issue solved (using local resource instead of remote)

* fix execution (loadgraph)

* 1st improvement pre-commit config file

* 1) pydocstyle fixes. all docstrings are now normalized
2) removed unused script setup_metadata.py

* new pre-commit hooks added
removed code formatting action

* update codeql action

* list of pre-commit hooks upgraded

* pre-commit as default for future clonings

* added pre-commit badge

* removed pre-commit template

* added pre-commit.ci

* WIP build_package.py

* build_package.py almost concluded

* build_package.py almost concluded

* build_package.py concluded

* testing workflow modifications

* testing pre-commit on workflow

* testing pre-commit on workflow v2

* removed poetry check from pre-commit (kept only for pre-PR)

* test commented out from build script

* black hook modified and security check disabled for pre-commit

* security check hook removed from pre-commit

* testing workflow

* testing workflow with pre-commit

* pre-commit removed from workflow

* workflow test for build package

* workflow test for build package

* workflow test for build package v2

* workflow test for build package v3

* workflow test for build package v4

* workflow test for build package v5

* workflow test for build package v6

* workflow test for build package v7

* workflow test for build package v8

* Update documentation

* workflow test for build package v9

* workflow test for build package v10

* workflow test for build package v11

* workflow test for build package v12

* workflow test for build package v13

* workflow test for build package v14

* version 1.3.0a submitted

* version 1.3.0a corrections

* version 1.3.0a corrections 2

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* workflow code_testing.yml updated

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
pedropaulofb and pre-commit-ci[bot] committed Sep 19, 2023
1 parent 7fe7c87 commit 8e048a3
Show file tree
Hide file tree
Showing 273 changed files with 4,400 additions and 23,650 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/code_testing.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Code Testing
name: Code testing

# Substitute for pull-request
on:
pull_request:
types:
- opened
on: push

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@701f152f28d4350ad289a5e31435e9ab6169a7ca # v2.21.6
uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -72,7 +72,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@701f152f28d4350ad289a5e31435e9ab6169a7ca # v2.21.6
uses: github/codeql-action/autobuild@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -85,6 +85,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@701f152f28d4350ad289a5e31435e9ab6169a7ca # v2.21.6
uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@701f152f28d4350ad289a5e31435e9ab6169a7ca # v2.21.6
uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
with:
sarif_file: results.sarif
90 changes: 45 additions & 45 deletions .github/workflows/update_docs.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
name: Update Docs

on:
pull_request_review:
types: [ approved ]
# workflow_run:
# workflows: [ "Code Testing" ]
# types:
# - completed

jobs:
generate-docs:
runs-on: ubuntu-latest

steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
with:
egress-policy: audit

- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with:
token: ${{ secrets.WORKFLOW_GIT_ACCESS_TOKEN }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Generate Documentation
run: |
python build_package.py
- name: Commit Generated Docs
run: |
git config --local user.email "pedropaulofb@gmail.com"
git config --local user.name "pedropaulofb"
git add .
git commit -m "Update documentation"
git push
name: Update Docs

on:
pull_request_review:
types: [ approved ]
# workflow_run:
# workflows: [ "Code Testing" ]
# types:
# - completed

jobs:
generate-docs:
runs-on: ubuntu-latest

steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
with:
egress-policy: audit

- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with:
token: ${{ secrets.WORKFLOW_GIT_ACCESS_TOKEN }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Generate Documentation
run: |
python build_package.py
- name: Commit Generated Docs
run: |
git config --local user.email "pedropaulofb@gmail.com"
git config --local user.name "pedropaulofb"
git add .
git commit -m "Update documentation"
git push
46 changes: 46 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,52 @@
exclude: ^(sphinx|doc)
repos:
- repo: https://github.com/Lucas-C/pre-commit-hooks-safety
rev: v1.3.1
hooks:
- id: python-safety-dependencies-check
files: pyproject.toml
stages:
- pre-push
- repo: https://github.com/jendrikseipp/vulture
rev: v2.9.1
hooks:
- id: vulture
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-ast
- id: check-case-conflict
- id: check-merge-conflict
- id: no-commit-to-branch
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.9.1
hooks:
- id: black
args: [ --line-length=120 ]
- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
hooks:
- id: flake8
args: [ --max-line-length=120 ]
- repo: https://github.com/pycqa/pydocstyle
rev: 6.3.0
hooks:
- id: pydocstyle
name: pydocstyle
description: pydocstyle is a static analysis tool for checking compliance with Python docstring conventions.
entry: pydocstyle
language: python
types: [ python ]
ci:
autofix_commit_msg: |
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
autofix_prs: true
autoupdate_branch: ''
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
autoupdate_schedule: weekly
skip: [ ]
submodules: false
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OntoUML/ontouml-json2graph/badge)
![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)
![License - GitHub](https://img.shields.io/github/license/ontouml/ontouml-json2graph)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/OntoUML/ontouml-json2graph/main.svg)](https://results.pre-commit.ci/latest/github/OntoUML/ontouml-json2graph/main)

# The OntoUML JSON2Graph Transformation

Expand Down
Loading

0 comments on commit 8e048a3

Please sign in to comment.