Skip to content

Commit 787f526

Browse files
committed
Add data resources
1 parent 2d2c33c commit 787f526

8 files changed

Lines changed: 19 additions & 9 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "talkops"
3-
version = "1.0.2"
3+
version = "1.0.3"
44
authors = [{ name = "PicoUX" }]
55
description = "TalkOps SDK"
66
readme = "README.md"

setup.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[options]
2+
packages = find:
3+
4+
[options.package_data]
5+
talkops = ["data/*"]

src/talkops/extension.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from importlib.resources import files
2+
from importlib.metadata import version
13
from urllib.parse import urlparse
24
from .publisher import Publisher
35
from .subscriber import Subscriber
@@ -9,7 +11,6 @@
911
import json
1012
import base64
1113
import os
12-
from importlib.metadata import version
1314

1415
class Extension:
1516
def __init__(self, token=None):
@@ -209,9 +210,9 @@ def send_notification(self, text):
209210
return self
210211

211212
def _get_categories(self):
212-
with open(os.path.join(os.path.dirname(__file__), 'categories.json'), 'r') as f:
213+
with files('talkops.data').joinpath('categories.json').open('r', encoding='utf-8') as f:
213214
return json.load(f)
214215

215216
def _get_event_types(self):
216-
with open(os.path.join(os.path.dirname(__file__), 'event-types.json'), 'r') as f:
217+
with files('talkops.data').joinpath('event-types.json').open('r', encoding='utf-8') as f:
217218
return json.load(f)

src/talkops/readme.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
from importlib.resources import files
2+
from jinja2 import BaseLoader, Environment
13
import os
24
import json
3-
from jinja2 import Environment, FileSystemLoader
45

56
class Readme:
67
def __init__(self, getter):
78
self._getter = getter
89
self._generate()
910

1011
def _generate(self):
12+
template_text = files('talkops.data').joinpath('readme.jinja2').read_text(encoding='utf-8')
13+
1114
current_dir = os.path.dirname(os.path.abspath(__file__))
1215
env = Environment(
13-
loader=FileSystemLoader(current_dir),
16+
loader=BaseLoader(),
1417
autoescape=True
1518
)
16-
template = env.get_template('readme.jinja2')
19+
template = env.from_string(template_text)
1720
output = template.render(extension=self._getter())
1821
with open('/app/README.md', 'w', encoding='utf-8') as f:
1922
f.write(output)

src/talkops/subscriber.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from importlib.resources import files
2+
from urllib.parse import quote
13
import asyncio
24
import json
35
import os
@@ -7,7 +9,6 @@
79
import sys
810
import threading
911
import time
10-
from urllib.parse import quote
1112

1213
class Subscriber:
1314
def __init__(self, use_config):
@@ -103,5 +104,5 @@ def _on_event(self, event):
103104
output = asyncio.run(output)
104105

105106
def _get_event_types(self):
106-
with open(os.path.join(os.path.dirname(__file__), 'event-types.json'), 'r') as f:
107+
with files('talkops.data').joinpath('event-types.json').open('r', encoding='utf-8') as f:
107108
return json.load(f)

0 commit comments

Comments
 (0)