From 06b0f2e4a9398ecf88a57040ec65ac5f1ab360fb Mon Sep 17 00:00:00 2001 From: cybersteve547 Date: Wed, 10 Dec 2025 09:06:42 -0500 Subject: [PATCH 1/5] Add pyproject.toml Signed-off-by: cybersteve547 --- pyproject.toml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..33f02214 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,43 @@ +[build-system] +requires = ["setuptools >= 77.0.3"] +build-backend = "setuptools.build_meta" + +[project] +version = "2.1.13" +name = "scratchattach" +dependencies = [ + "websocket-client", + "requests", + "bs4", + "SimpleWebSocketServer", + "typing-extensions", + "browser_cookie3", + "aiohttp", + "rich" +] +requires-python = ">= 3.12" +authors = [{name = "TimMcCool", email = ""}] +description = "A Scratch API Wrapper" +readme = "README.md" +license = "MIT" +license-files = ["LICENSE"] +keywords = ["scratch api", "scratchattach", "scratch api python", "scratch python", "scratch for python", "scratch", "scratch cloud", "scratch cloud variables", "scratch bot"] +classifiers=[ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Programming Language :: Python :: 3", + "Operating System :: Unix", + "Operating System :: MacOS :: MacOS X", + "Operating System :: Microsoft :: Windows", +] + +[project.urls] +Source = "https://github.com/timmccool/scratchattach" +Homepage = "https://scratchattach.tim1de.net" + +[project.optional-dependencies] +cli = ["rich-pixels"] +lark = ["lark"] + +[project.entry-points."console_scripts"] +scratch = "scratchattach.__main__:main" From 6fed974e0b76a521e10a33e8642be367bb6d5063 Mon Sep 17 00:00:00 2001 From: cybersteve547 Date: Wed, 10 Dec 2025 09:07:50 -0500 Subject: [PATCH 2/5] Delete requirements.txt Signed-off-by: cybersteve547 --- requirements.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 5bf0c0cc..00000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -websocket-client -requests -bs4 -SimpleWebSocketServer -typing-extensions -browser_cookie3 -aiohttp -rich -# install rich-pixels if you want CLI image support. This is an optional dependency. From 52596c73b5196048abab4dd4fe63fdb55fc4ded0 Mon Sep 17 00:00:00 2001 From: cybersteve547 Date: Wed, 10 Dec 2025 09:07:58 -0500 Subject: [PATCH 3/5] Delete setup.py Signed-off-by: cybersteve547 --- setup.py | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index 5b480908..00000000 --- a/setup.py +++ /dev/null @@ -1,46 +0,0 @@ -from setuptools import setup, find_packages -import codecs -import os - -VERSION = '2.1.13' # consider updating the CLI version number too -DESCRIPTION = 'A Scratch API Wrapper' -with open('README.md', encoding='utf-8') as f: - LONG_DESCRIPTION = f.read() - -with open('requirements.txt', encoding='utf-8') as f: - requirements = f.read().strip().splitlines() - -# Setting up -setup( - name="scratchattach", - version=VERSION, - author="TimMcCool", - author_email="", - description=DESCRIPTION, - long_description_content_type="text/markdown", - long_description=LONG_DESCRIPTION, - packages=find_packages(), - python_requires='>=3.12', - install_requires=requirements, - entry_points={ - 'console_scripts': [ - "scratch=scratchattach.__main__:main" - ] - }, - extras_require={ - "lark": ["lark"] - }, - keywords=['scratch api', 'scratchattach', 'scratch api python', 'scratch python', 'scratch for python', 'scratch', 'scratch cloud', 'scratch cloud variables', 'scratch bot'], - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "Programming Language :: Python :: 3", - "Operating System :: Unix", - "Operating System :: MacOS :: MacOS X", - "Operating System :: Microsoft :: Windows", - ], - project_urls={ - "Source": "https://github.com/timmccool/scratchattach", - "Homepage": 'https://scratchattach.tim1de.net' - } -) From 79174eeec41dfd91b109ef113502e76424ebf34d Mon Sep 17 00:00:00 2001 From: cybersteve547 Date: Wed, 10 Dec 2025 09:13:18 -0500 Subject: [PATCH 4/5] Shifted pyproject.toml properties to match setup.py more Signed-off-by: cybersteve547 --- pyproject.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 33f02214..2dbabcac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,8 +3,11 @@ requires = ["setuptools >= 77.0.3"] build-backend = "setuptools.build_meta" [project] -version = "2.1.13" name = "scratchattach" +version = "2.1.13" +authors = [{name = "TimMcCool", email = ""}] +description = "A Scratch API Wrapper" +requires-python = ">= 3.12" dependencies = [ "websocket-client", "requests", @@ -15,9 +18,6 @@ dependencies = [ "aiohttp", "rich" ] -requires-python = ">= 3.12" -authors = [{name = "TimMcCool", email = ""}] -description = "A Scratch API Wrapper" readme = "README.md" license = "MIT" license-files = ["LICENSE"] @@ -35,9 +35,9 @@ classifiers=[ Source = "https://github.com/timmccool/scratchattach" Homepage = "https://scratchattach.tim1de.net" +[project.entry-points."console_scripts"] +scratch = "scratchattach.__main__:main" + [project.optional-dependencies] cli = ["rich-pixels"] lark = ["lark"] - -[project.entry-points."console_scripts"] -scratch = "scratchattach.__main__:main" From 6ade7c815f8ea62db828e7490ae2498d48c897da Mon Sep 17 00:00:00 2001 From: cybersteve547 Date: Wed, 10 Dec 2025 09:29:45 -0500 Subject: [PATCH 5/5] Fixed errors in testing Signed-off-by: cybersteve547 --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2dbabcac..70b68663 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "scratchattach" version = "2.1.13" -authors = [{name = "TimMcCool", email = ""}] +authors = [{name = "TimMcCool"}] description = "A Scratch API Wrapper" requires-python = ">= 3.12" dependencies = [ @@ -41,3 +41,6 @@ scratch = "scratchattach.__main__:main" [project.optional-dependencies] cli = ["rich-pixels"] lark = ["lark"] + +[tool.setuptools.packages] +find = {include = ["scratchattach"]}