From d25555fb44fcf8ebdbc370ce290041b97d58c3e9 Mon Sep 17 00:00:00 2001 From: mndza Date: Thu, 15 Feb 2024 16:58:16 +0100 Subject: [PATCH] apollo_fpga: get rid of `poetry` and add `prompt-toolkit` dependency --- poetry.lock | 30 ------------------------ pyproject.toml | 49 ++++++++++++++++++++++++++++----------- setup.py | 63 -------------------------------------------------- 3 files changed, 35 insertions(+), 107 deletions(-) delete mode 100644 poetry.lock delete mode 100644 setup.py diff --git a/poetry.lock b/poetry.lock deleted file mode 100644 index 89ba88b..0000000 --- a/poetry.lock +++ /dev/null @@ -1,30 +0,0 @@ -[[package]] -name = "pyusb" -version = "1.1.1" -description = "Python USB access module" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pyvcd" -version = "0.2.4" -description = "Python VCD file support" -category = "main" -optional = false -python-versions = ">=3.6" - -[metadata] -lock-version = "1.1" -python-versions = "^3.7" -content-hash = "8112dcfc5fac0ae7fe9025e45dae41cd102bcdaa8f5325e3cdbecd954178aec2" - -[metadata.files] -pyusb = [ - {file = "pyusb-1.1.1-py3-none-any.whl", hash = "sha256:f18eb813d3a1439918071234589162c2f209a19adbeffeb1377ce078a4aebc70"}, - {file = "pyusb-1.1.1.tar.gz", hash = "sha256:7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"}, -] -pyvcd = [ - {file = "pyvcd-0.2.4-py2.py3-none-any.whl", hash = "sha256:c40b0e586a74cddaf82e6989f0168ae7f9b4f182a9a106a0da9df0d11a9c6b3b"}, - {file = "pyvcd-0.2.4.tar.gz", hash = "sha256:071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d"}, -] diff --git a/pyproject.toml b/pyproject.toml index 1c9c9b3..33e0060 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,20 +1,41 @@ -[tool.poetry] +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] name = "apollo-fpga" version = "0.0.5" +authors = [ + {name = "Great Scott Gadgets", email = "dev@greatscottgadgets.com"} +] +license = { text = "BSD" } description = "host tools for Apollo FPGA debug controllers" -authors = ["Great Scott Gadgets "] -license = "BSD" +readme = "README.md" +requires-python = ">=3.8" +classifiers = [ + 'Programming Language :: Python', + 'Development Status :: 5 - Production/Stable', + 'Natural Language :: English', + 'Environment :: Console', + 'Environment :: Plugins', + 'Intended Audience :: Developers', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Topic :: Scientific/Engineering', + 'Topic :: Security', +] +dependencies = [ + "pyusb>1.1.1", + "pyvcd>=0.2.4", + "prompt-toolkit>3.0.16", +] -[tool.poetry.dependencies] -python = "^3.7" -pyusb = "^1.1.1" -pyvcd = "^0.2.4" +[project.urls] +repository = "https://github.com/greatscottgadgets/apollo" -[tool.poetry.dev-dependencies] +[tool.setuptools] +packages = ["apollo_fpga"] -[tool.poetry.scripts] -apollo = 'apollo_fpga.commands.cli:main' - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" +[project.scripts] +apollo = "apollo_fpga.commands.cli:main" diff --git a/setup.py b/setup.py deleted file mode 100644 index 3a42930..0000000 --- a/setup.py +++ /dev/null @@ -1,63 +0,0 @@ -import os -import sys - -from setuptools import setup, find_packages - - -# Provide our default install requirements. -install_requirements = [ - 'pyusb', - 'pyvcd', -] - -# On ReadTheDocs don't enforce requirements; we'll use requirements.txt -# to provision the documentation builder. -if os.environ.get('READTHEDOCS') == 'True': - install_requirements = [] - - -setup( - - # Vitals - name='apollo-fpga', - license='BSD', - url='https://github.com/greatscottgadgets/apollo', - author='Great Scott Gadgets', - author_email='info@greatscottgadgets.com', - description='host tools for Apollo FPGA debug controllers', - use_scm_version= { - "root": '..', - "relative_to": __file__, - "version_scheme": "guess-next-dev", - "local_scheme": lambda version : version.format_choice("+{node}", "+{node}.dirty"), - "fallback_version": "r0.0" - }, - - # Imports / exports / requirements. - platforms='any', - packages=find_packages(), - include_package_data=True, - python_requires="~=3.7", - install_requires=install_requirements, - setup_requires=['setuptools', 'setuptools_scm'], - entry_points= { - 'console_scripts': [ - 'apollo = apollo_fpga.commands.cli:main', - ], - }, - - # Metadata - classifiers = [ - 'Programming Language :: Python', - 'Development Status :: 1 - Planning', - 'Natural Language :: English', - 'Environment :: Console', - 'Environment :: Plugins', - 'Intended Audience :: Developers', - 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Topic :: Scientific/Engineering', - 'Topic :: Security', - ], -)