From 5469b2041f92db4d978bbfe52cc50814b66b5e65 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 2 Jan 2019 17:32:44 +0900 Subject: [PATCH 1/2] #225: rename version.py to __about__.py --- onlinejudge/{implementation/version.py => __about__.py} | 0 onlinejudge/__init__.py | 2 +- onlinejudge/implementation/main.py | 2 +- onlinejudge/implementation/utils.py | 2 +- setup.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename onlinejudge/{implementation/version.py => __about__.py} (100%) diff --git a/onlinejudge/implementation/version.py b/onlinejudge/__about__.py similarity index 100% rename from onlinejudge/implementation/version.py rename to onlinejudge/__about__.py diff --git a/onlinejudge/__init__.py b/onlinejudge/__init__.py index d7fbaa82..15fb0cbd 100644 --- a/onlinejudge/__init__.py +++ b/onlinejudge/__init__.py @@ -1,5 +1,5 @@ # Python Version: 3.x -from onlinejudge.implementation.version import * +from onlinejudge.__about__ import * import onlinejudge.atcoder import onlinejudge.yukicoder import onlinejudge.anarchygolf diff --git a/onlinejudge/implementation/main.py b/onlinejudge/implementation/main.py index ae2a4d69..4979dd05 100644 --- a/onlinejudge/implementation/main.py +++ b/onlinejudge/implementation/main.py @@ -1,9 +1,9 @@ # Python Version: 3.x # -*- coding: utf-8 -*- import onlinejudge +import onlinejudge.__about__ as version import onlinejudge.implementation.utils as utils import onlinejudge.implementation.logging as log -import onlinejudge.implementation.version as version from onlinejudge.implementation.command.download import download from onlinejudge.implementation.command.login import login from onlinejudge.implementation.command.submit import submit diff --git a/onlinejudge/implementation/utils.py b/onlinejudge/implementation/utils.py index a37257c0..99ce4aee 100644 --- a/onlinejudge/implementation/utils.py +++ b/onlinejudge/implementation/utils.py @@ -1,7 +1,7 @@ # Python Version: 3.x # -*- coding: utf-8 -*- import onlinejudge.implementation.logging as log -import onlinejudge.implementation.version as version +import onlinejudge.__about__ as version from onlinejudge.problem import LabeledString, TestCase import re import os diff --git a/setup.py b/setup.py index 11a436f3..6062a5fe 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ def load_module(module_path): file, path, description = imp.find_module(name, path) path = [ path ] return imp.load_module(name, file, path[0], description) -version = load_module('onlinejudge.implementation.version') +version = load_module('onlinejudge.__about__') with open('readme.md', encoding='utf-8') as fh: readme = fh.read() From 06277724d568fd4f44f35ce2f4e3b806a74f5311 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 2 Jan 2019 17:33:41 +0900 Subject: [PATCH 2/2] #225: rename the variable in __about__.py --- onlinejudge/__about__.py | 2 +- onlinejudge/implementation/main.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/onlinejudge/__about__.py b/onlinejudge/__about__.py index 85e46187..0cac9df2 100644 --- a/onlinejudge/__about__.py +++ b/onlinejudge/__about__.py @@ -1,5 +1,5 @@ # Python Version: 3.x -name = 'online-judge-tools' +__package_name__ = 'online-judge-tools' __author__ = 'Kimiyuki Onaka' __email__ = 'kimiyuki95@gmail.com' __license__ = 'MIT License' diff --git a/onlinejudge/implementation/main.py b/onlinejudge/implementation/main.py index 4979dd05..cf1ceadf 100644 --- a/onlinejudge/implementation/main.py +++ b/onlinejudge/implementation/main.py @@ -23,8 +23,8 @@ def version_check() -> None: - if pipdate.needs_checking(version.name): - print(pipdate.check(version.name, version.__version__), end='') + if pipdate.needs_checking(version.__package_name__): + print(pipdate.check(version.__package_name__, version.__version__), end='') def get_parser() -> argparse.ArgumentParser: diff --git a/setup.py b/setup.py index 6062a5fe..fed4ded9 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def load_module(module_path): readme = fh.read() setup( - name=version.name, + name=version.__package_name__, version=version.__version__, description='Tools for online-judge services', install_requires=[