From a53947fca348796e90cbb59e06434130e94cc008 Mon Sep 17 00:00:00 2001 From: Shin'ichiro Kawasaki Date: Sun, 11 Oct 2020 15:15:15 +0900 Subject: [PATCH] pyscrlink/*.py, setup.py: Rename project to pyscrlink Rename bluepy_scratch_link strings in python scripts to pyscrlink. Signed-off-by: Shin'ichiro Kawasaki --- pyscrlink/__main__.py | 2 +- pyscrlink/gencert.py | 2 +- pyscrlink/scratch_link.py | 4 ++-- setup.py | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyscrlink/__main__.py b/pyscrlink/__main__.py index 9edba89..756bcd9 100644 --- a/pyscrlink/__main__.py +++ b/pyscrlink/__main__.py @@ -1,6 +1,6 @@ #!/usr/bin/python -from bluepy_scratch_link.scratch_link import main as _main +from pyscrlink.scratch_link import main as _main if __name__ == '__main__': _main() diff --git a/pyscrlink/gencert.py b/pyscrlink/gencert.py index 9c8b7bd..453f7b2 100755 --- a/pyscrlink/gencert.py +++ b/pyscrlink/gencert.py @@ -36,7 +36,7 @@ for cmd in DEPENDENT_TOOLS: SCRATCH_CERT_NICKNAME = "device-manager.scratch.mit.edu" homedir = os.path.expanduser('~') -localdir = os.path.join(homedir, ".local/share/bluepy-scratch-link/") +localdir = os.path.join(homedir, ".local/share/pyscrlink/") cert_file_path = os.path.join(localdir, "scratch-device-manager.cer") key_file_path = os.path.join(localdir, "scratch-device-manager.key") diff --git a/pyscrlink/scratch_link.py b/pyscrlink/scratch_link.py index c02c8d2..1e60601 100755 --- a/pyscrlink/scratch_link.py +++ b/pyscrlink/scratch_link.py @@ -21,14 +21,14 @@ import bluetooth # for BLESession (e.g. BBC micro:bit) from bluepy.btle import Scanner, UUID, Peripheral, DefaultDelegate from bluepy.btle import BTLEDisconnectError, BTLEManagementError -from bluepy_scratch_link import bluepy_helper_cap +from pyscrlink import bluepy_helper_cap import threading import time import queue # for websockets certificate -from bluepy_scratch_link import gencert +from pyscrlink import gencert logLevel = logging.INFO diff --git a/setup.py b/setup.py index 1e3ebac..dbf1120 100644 --- a/setup.py +++ b/setup.py @@ -4,14 +4,14 @@ with open("README.md", "r") as fh: long_description = fh.read() setuptools.setup( - name="bluepy-scratch-link-shin-kawasaki", - version="0.0.9", + name="pyscrlink", + version="0.1b4", author="Shin'ichiro Kawasaki", author_email='kawasaki@juno.dti.ne.jp', description='Scratch-link for Linux with Python', long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/kawasaki/bluepy-scratch-link", + url="https://github.com/kawasaki/pyscrlink", packages=setuptools.find_packages(), classifiers=[ "Programming Language :: Python :: 3.6", @@ -21,8 +21,8 @@ setuptools.setup( python_requires='>=3.6', entry_points={ 'console_scripts': [ - 'scratch_link = bluepy_scratch_link.scratch_link:main', - 'bluepy_helper_cap = bluepy_scratch_link.bluepy_helper_cap:setcap' + 'scratch_link = pyscrlink.scratch_link:main', + 'bluepy_helper_cap = pyscrlink.bluepy_helper_cap:setcap' ], }, )