From c2cc6e700da8952007a9cb2ac528c1cb1ed84e3f Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 25 Mar 2024 06:24:06 -0400 Subject: [PATCH] revert toml setup for now --- decompyle3/version.py | 2 +- pyproject.toml | 54 ------------------------------------------- setup.py | 50 +++++++++++++++++++++++++++++++-------- 3 files changed, 42 insertions(+), 64 deletions(-) delete mode 100644 pyproject.toml diff --git a/decompyle3/version.py b/decompyle3/version.py index 0c64abe8..d72e5217 100644 --- a/decompyle3/version.py +++ b/decompyle3/version.py @@ -13,4 +13,4 @@ # This file is suitable for sourcing inside bash as # well as importing into Python # fmt: off -__version__="3.9.1" # noqa +__version__="3.9.2dev0" # noqa diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index e82eee52..00000000 --- a/pyproject.toml +++ /dev/null @@ -1,54 +0,0 @@ -[build-system] -requires = [ - "setuptools>=61.2", -] - -build-backend = "setuptools.build_meta" - -[project] -authors = [ - {name = "Rocky Bernstein", email = "rb@dustyfeet.com"}, -] - -name = "decompyle3" -description = "Python cross-version byte-code library and disassembler" -dependencies = [ - "click", - "spark-parser >= 1.8.9, < 1.9.0", - "xdis >= 6.0.8, < 6.2.0", -] -readme = "README.rst" -license = {text = "GPL"} -keywords = ["Python bytecode", "bytecode", "disassembler"] -classifiers = [ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python", - "Topic :: Software Development :: Libraries :: Python Modules", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", -] -dynamic = ["version"] - -[project.urls] -Homepage = "https://github.com/rocky/python-decompile3" -Downloads = "https://github.com/rocky/python-decompile3/releases" - -[project.optional-dependencies] -dev = [ - "pre-commit", - "pytest", -] - -[project.scripts] -decompyle3 = "decompyle3.bin.decompile:main_bin" -decompyle3-code = "decompyle3.bin.decompile_code_type:main" -decompyle3-tokenize = "decompyle3.bin.decompile_tokens:main" - -[tool.setuptools.dynamic] -version = {attr = "decompyle3.version.__version__"} diff --git a/setup.py b/setup.py index caf7a507..8cae7747 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,23 @@ import sys -from setuptools import setup +import setuptools + +from __pkginfo__ import ( + __version__, + author, + author_email, + classifiers, + entry_points, + install_requires, + license, + long_description, + modname, + py_modules, + short_desc, + web, + zip_safe, +) SYS_VERSION = sys.version_info[0:2] if SYS_VERSION < (3, 7): @@ -12,12 +28,28 @@ print(mess) raise Exception(mess) -setup( - packages=[ - "decompyle3", - "decompyle3.bin", - "decompyle3.parsers", - "decompyle3.scanners", - "decompyle3.semantics", - ] +setuptools.setup( + author=author, + author_email=author_email, + classifiers=classifiers, + description=short_desc, + # entry_points=entry_points, + entry_points={ + "console_scripts": [ + "decompyle3=decompyle3.bin.decompile:main_bin", + "decompyle3-code=decompyle3.bin.decompile_code_type:main", + "decompyle3-tokens=decompyle3.bin.decompile_tokens:main", + ] + }, + install_requires=install_requires, + license=license, + long_description=long_description, + name=modname, + packages=setuptools.find_packages(), + py_modules=py_modules, + test_suite="nose.collector", + url=web, + tests_require=["nose>=1.0"], + version=__version__, + zip_safe=zip_safe, )