Skip to content

Commit 5c52ee2

Browse files
DinisCruzDinisCruz
committed
started adding poetry support and upgrade to latest version of OSBot-Utils
1 parent cf16a75 commit 5c52ee2

File tree

10 files changed

+479
-15
lines changed

10 files changed

+479
-15
lines changed

‎.github/workflows/ci-pipeline__dev.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name : CI Pipeline - DEV
2+
on:
3+
push:
4+
branches:
5+
- dev
6+
7+
env:
8+
GIT__BRANCH : 'dev'
9+
PACKAGE_NAME : 'osbot_jira'
10+
RELEASE_TYPE : 'minor'
11+
12+
jobs:
13+
14+
run-unit-tests:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Run Unit Tests (using Pytest)
19+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pytest__run-tests@dev
20+
21+
increment-tag:
22+
name: Increment Tag - DEV
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v4
26+
- name: Increment Tag (for DEV)
27+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__increment-tag@dev
28+
with:
29+
release_type: ${{env.RELEASE_TYPE}}
30+
needs:
31+
- run-unit-tests
32+

‎.github/workflows/ci-pipeline__main.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name : CD Pipeline - MAIN
2+
on:
3+
push:
4+
branches:
5+
- main
6+
7+
8+
env:
9+
GIT__BRANCH : 'main'
10+
PACKAGE_NAME : 'osbot_jira'
11+
RELEASE_TYPE : 'major'
12+
13+
jobs:
14+
15+
run-unit-tests:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Run Unit Tests (using Pytest)
20+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pytest__run-tests@dev
21+
22+
23+
increment-tag:
24+
name: Increment Tag - MAIN
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
29+
- name: Increment Tag (for MAIN)
30+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__increment-tag@dev
31+
with:
32+
release_type: ${{env.RELEASE_TYPE}}
33+
needs:
34+
- run-unit-tests
35+
36+
publish-to-pypi:
37+
permissions:
38+
id-token: write
39+
name: "Publish to PYPI"
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- uses: actions/checkout@v4
44+
45+
- name: Git Update Current Branch
46+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__update_branch@dev
47+
48+
- name: publish-to-pypi
49+
uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pypi__publish@dev
50+
needs:
51+
- increment-tag
52+

‎deploy/docker/plantuml/docker-compose.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
services:
2+
plantuml:
3+
image: plantuml/plantuml-server
4+
container_name: plantuml-server
5+
restart: unless-stopped
6+
ports:
7+
- "8080:8080"

‎docs/jira-as-graph-db/project-plan__jira-exported-to-s3-and-git.md‎

Lines changed: 184 additions & 0 deletions
Large diffs are not rendered by default.

‎osbot_jira/api/jira_server/API_Jira_Rest.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
import requests
2-
from dotenv import load_dotenv
3-
from osbot_utils.decorators.lists.index_by import index_by
4-
from osbot_utils.decorators.methods.cache_on_self import cache_on_self
5-
6-
from osbot_utils.testing.Duration import Duration
7-
from osbot_utils.utils.Dev import Dev
8-
from osbot_utils.utils.Files import path_combine, create_folder, file_create_bytes, file_not_exists
9-
from osbot_utils.utils.Json import json_dumps, file_create_json
10-
from osbot_utils.utils.Lists import list_chunks
11-
from osbot_utils.utils.Misc import list_set, date_time_now_less_time_delta, upper
12-
from osbot_utils.utils.Objects import env_vars
2+
from osbot_utils.decorators.lists.index_by import index_by
3+
from osbot_utils.decorators.methods.cache_on_self import cache_on_self
4+
from osbot_utils.testing.Duration import Duration
5+
from osbot_utils.utils.Dev import Dev
6+
from osbot_utils.utils.Env import load_dotenv, env_vars
7+
from osbot_utils.utils.Files import path_combine, create_folder, file_create_bytes, file_not_exists
8+
from osbot_utils.utils.Json import json_dumps, file_create_json
9+
from osbot_utils.utils.Lists import list_chunks
10+
from osbot_utils.utils.Misc import list_set, date_time_now_less_time_delta, upper
1311

1412

1513
class API_Jira_Rest:

‎osbot_jira/api/plantuml/API_Plant_UML.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import base64
22

33
import requests
4-
5-
from osbot_aws.apis.Lambda import Lambda
6-
from osbot_utils.utils.Files import Files
4+
from osbot_aws.aws.lambda_.Lambda import Lambda
5+
from osbot_utils.utils.Files import Files
76

87

98
class API_Plant_UML:

‎osbot_jira/api/plantuml/Puml.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def enduml(self):
6464
return self
6565

6666
def fix_id(self, id):
67-
return str_safe(id)
67+
return str_safe(id).replace('-', '_')
6868
#if id:
6969
# return id.replace(' ','_').replace('-','_').replace(':','_').replace('/','_').replace('(','_').replace(')','_')
7070

‎poetry.lock‎

Lines changed: 171 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[tool.poetry]
2+
name = "osbot_jira"
3+
version = "v0.0.1"
4+
description = "OWASP Security Bot - Jira"
5+
authors = ["Dinis Cruz <dinis.cruz@owasp.org>"]
6+
license = "Apache-2.0"
7+
readme = "README.md"
8+
homepage = "https://github.com/owasp-sbot/OSBot-Jira"
9+
repository = "https://github.com/owasp-sbot/OSBot-Jira"
10+
11+
[tool.poetry.dependencies]
12+
python = "^3.9"
13+
osbot-utils = "*"
14+
osbot-aws = "*"
15+
16+
[build-system]
17+
requires = ["poetry-core>=1.0.0"]
18+
build-backend = "poetry.core.masonry.api"

‎requirements-test.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# needed for pytest execution
2+
pytest
3+
coveralls

0 commit comments

Comments
 (0)