Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace pkg_resources with importlib #1

Closed
wants to merge 5 commits into from
Closed

Replace pkg_resources with importlib #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdf0749
Update README.md
isym444 Feb 12, 2024
156c21a
Update README.ja.md
isym444 Feb 12, 2024
cf921a4
Update README.md
koba-e964 Feb 13, 2024
df01cb4
Merge pull request #84 from isym444/patch-1
koba-e964 Feb 13, 2024
cb3a9a6
Replace pkg_resources with importlib
t4-project Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.ja.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ API ドキュメントは [onlinejudge_template.generator package](https://onlin

### oj-prepare

`oj-prepare` の設定は (Linux の場合は) `~/.config/online-judge-tools/prepare.config.toml` で行えます。
以下のように書いてください。
`oj-prepare` の設定は (Linux の場合は) `~/.config/online-judge-tools/prepare.config.toml` で行えます。MacOS の場合は `/Users/{user_name}/Library/Application Support/online-judge-tools/prepare.config.toml` で行えます。以下のように書いてください。

``` toml
contest_directory = "~/Desktop/{service_domain}/{contest_id}/{problem_id}"
Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,11 @@ Also you can use certain directory (when you use Linux, it's `~/.config/online-j

### oj-prepare

There is the config file for `oj-prepare` at `~/.config/online-judge-tools/prepare.config.toml` (in Linux).
Please write as the following.
The config file for `oj-prepare` can be found at the following paths depending on your operating system:
`~/.config/online-judge-tools/prepare.config.toml` (Linux)
`/Users/{user_name}/Library/Application Support/online-judge-tools/prepare.config.toml` (MacOS)

Please use the following format when editing the file:

``` toml
contest_directory = "~/Desktop/{service_domain}/{contest_id}/{problem_id}"
Expand Down
4 changes: 2 additions & 2 deletions onlinejudge_template/generator/_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import importlib.resources
import pathlib
from logging import getLogger
from typing import *

import appdirs
import mako.lookup
import mako.template
import pkg_resources

import onlinejudge_template.generator.hook as hook
from onlinejudge_template.types import *
Expand All @@ -16,7 +16,7 @@
def _get_template(template_file: str) -> mako.template.Template:
directories = [
str(pathlib.Path(appdirs.user_config_dir('online-judge-tools')) / 'template'),
pkg_resources.resource_filename('onlinejudge_template_resources', 'template'),
importlib.resources.files('onlinejudge_template_resources') / 'template',
]
lookup = mako.lookup.TemplateLookup(directories=directories, input_encoding="utf-8", output_encoding="utf-8")
path = pathlib.Path(template_file)
Expand Down