diff --git a/.mypy.ini b/.mypy.ini deleted file mode 100644 index 9789f51fd..000000000 --- a/.mypy.ini +++ /dev/null @@ -1,5 +0,0 @@ -[mypy] -disable_error_code=import-untyped,var-annotated,import-not-found - -[mypy-chirp.drivers.*] -disable_error_code=assignment diff --git a/MANIFEST.in b/MANIFEST.in index 12a2b8ffb..90e5cf8fd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,6 +8,5 @@ include chirp/stock_configs/* include chirp/locale/*/LC_MESSAGES/*.mo exclude chirp/locale/* include COPYING -include *requirements.txt graft tests graft tools diff --git a/pylintrc b/pylintrc deleted file mode 100644 index b62288235..000000000 --- a/pylintrc +++ /dev/null @@ -1,249 +0,0 @@ -[MASTER] - -# Specify a configuration file. -#rcfile= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Profiled execution. -profile=no - -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=CVS - -# Pickle collected data for later comparisons. -persistent=yes - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - - -[MESSAGES CONTROL] - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time. -#enable= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). -#disable= - - -[REPORTS] - -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html -output-format=text - -# Include message's id in output -include-ids=no - -# Put messages in a separate file for each module / package specified on the -# command line instead of printing them on stdout. Reports (if any) will be -# written in a file name "pylint_global.[txt|html]". -files-output=no - -# Tells whether to display a full report or only the messages -reports=yes - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Add a comment according to your evaluation note. This is used by the global -# evaluation report (RP0004). -comment=no - - -[SIMILARITIES] - -# Minimum lines number of a similarity. -min-similarity-lines=4 - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - - -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=80 - -# Maximum number of lines in a module -max-module-lines=1000 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO - - -[TYPECHECK] - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamically set). -ignored-classes=SQLObject - -# When zope mode is activated, add a predefined set of Zope acquired attributes -# to generated-members. -zope=no - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E0201 when accessed. Python regular -# expressions are accepted. -generated-members=REQUEST,acl_users,aq_parent - - -[VARIABLES] - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching the beginning of the name of dummy variables -# (i.e. not used). -dummy-variables-rgx=_|dummy|foo - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - - -[BASIC] - -# Required attributes for module, separated by a comma -required-attributes= - -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input - -# Regular expression which should only match correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Regular expression which should only match correct module level names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Regular expression which should only match correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ - -# Regular expression which should only match correct function names -function-rgx=[a-z_][a-z0-9_]{1,30}$ - -# Regular expression which should only match correct method names -method-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct instance attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct argument names -argument-rgx=[a-z_][a-z0-9_]{1,30}$ - -# Regular expression which should only match correct variable names -variable-rgx=[a-z_][a-z0-9_]{1,30}$ - -# Regular expression which should only match correct list comprehension / -# generator expression variable names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,v,f,e,ex,Run,_ - -# Bad variable names which should always be refused, separated by a comma -bad-names=bar,baz,toto,tutu,tata - -# Regular expression which should only match functions or classes name which do -# not require a docstring -no-docstring-rgx=__.*__|_.* - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.* - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of branch for function / method body -max-branchs=20 - -# Maximum number of statements in function / method body -max-statements=50 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of attributes for a class (see R0902). -max-attributes=25 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=0 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=40 - - -[CLASSES] - -# List of interface methods to ignore, separated by a comma. This is used for -# instance to not check methods defines in Zope's Interface base class. -ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - - -[IMPORTS] - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,string,TERMIOS,Bastion,rexec - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..3d5af7ce7 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,59 @@ +[build-system] +requires = ["setuptools>=61"] +build-backend = "setuptools.build_meta" + +[project] +name = "chirp" +version = "0" +description = "A cross-platform cross-radio programming tool" +requires-python = ">=3.10,<4" +dependencies = [ + "pyserial", + "requests", + "yattag", + "suds", + "lark", + 'pywin32 ; platform_system=="Windows"', +] + +[project.urls] +Homepage = "https://chirpmyradio.com" + +# These wxPython pins match the versions used for the binary builds. They're +# specific to the versions of the base platforms that we build on. They may be +# older than what you want for building from source on a later version. Since +# we focus on those binary builds, please do not propose changes that would +# take them out of sync with the build system or file bugs about these being +# wrong for your specific situation. +[project.optional-dependencies] +wx = [ + 'wxPython>=4.0,<4.2.0 ; platform_system=="Linux"', # https://github.com/wxWidgets/Phoenix/issues/2225 + 'wxPython==4.2.0 ; platform_system!="Linux"', +] +test = [ + "pytest==7.1.3", # https://github.com/pytest-dev/pytest/issues/10428 + "pytest-xdist", + "pytest-html", + "six", + "pep8", + "pyyaml", + "ddt", +] + +[project.scripts] +chirp = "chirp.wxui:chirpmain" +chirpc = "chirp.cli.main:main" +experttune = "chirp.cli.experttune:main" + +[tool.setuptools] +include-package-data = true + +[tool.setuptools.packages.find] +include = ["chirp*"] + +[tool.mypy] +disable_error_code = ["import-untyped", "var-annotated", "import-not-found"] + +[[tool.mypy.overrides]] +module = "chirp.drivers.*" +disable_error_code = ["assignment"] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 347b75ddb..000000000 --- a/requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -# These are the requirements for the versions of wxPython (and others) -# that match the binary builds. They're specific to the versions of the base -# platforms that we build on. They may be older than what you want for building -# from source on a later version. Since we focus on those binary builds, -# please do not propose changes to this that would take them out of sync with -# the build system or file bugs about these being wrong for your specific -# situation. -wxPython>=4.0,<4.2.0 ; platform_system=="Linux" # See https://github.com/wxWidgets/Phoenix/issues/2225 -wxPython==4.2.0 ; platform_system!="Linux" -pyserial -requests -pywin32; platform_system=="Windows" -suds -yattag -lark diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ba216f19e..000000000 --- a/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[bdist_rpm] -requires = pyserial -packager = Dan Smith -description = A frequency tool for Icom D-STAR Repeaters -vendor = KK7DS diff --git a/setup.py b/setup.py deleted file mode 100644 index c0884fe09..000000000 --- a/setup.py +++ /dev/null @@ -1,28 +0,0 @@ -from setuptools import setup -from setuptools import find_packages - -setup(name='chirp', - description='A cross-platform cross-radio programming tool', - packages=find_packages(include=["chirp*"]), - include_package_data=True, - version=0, - url='https://chirp.danplanet.com', - python_requires=">=3.10,<4", - install_requires=[ - 'pyserial', - 'requests', - 'yattag', - 'suds', - 'lark', - ], - extras_require={ - 'wx': ['wxPython'], - }, - entry_points={ - 'console_scripts': [ - "chirp=chirp.wxui:chirpmain", - "chirpc=chirp.cli.main:main", - "experttune=chirp.cli.experttune:main", - ], - }, - ) diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 07deee049..000000000 --- a/test-requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -# https://github.com/pytest-dev/pytest/issues/10428 -pytest==7.1.3 -pytest-xdist -pytest-html -six -pep8 -pyserial -requests -pyyaml -pywin32; platform_system=="Windows" -ddt diff --git a/tox.ini b/tox.ini index c9a2cb6d3..2c6c4c104 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ deps = mypy<2.0.0 commands = python ./tools/cpep8.py {posargs} - mypy --config-file .mypy.ini chirp --exclude='chirp/share/*' + mypy chirp --exclude='chirp/share/*' [textenv:py3clean] commands = @@ -34,8 +34,7 @@ commands = [testenv:unit] setenv = PYTHONPATH=../.. -deps = - -rtest-requirements.txt +extras = test commands = pytest --disable-warnings --html=unit_report.html -v tests/unit {posargs} @@ -43,9 +42,7 @@ commands = setenv = PYTHONPATH=../.. CHIRP_DEBUG=y -deps = - {[testenv:unit]deps} - pytest-xdist +extras = test commands = pytest --disable-warnings --html=driver_report.html -v tests/test_drivers.py -n auto {posargs} @@ -53,9 +50,7 @@ commands = setenv = PYTHONPATH=../.. CHIRP_DEBUG=y -deps = - {[testenv:unit]deps} - pytest-xdist +extras = test commands = python tools/fast-driver.py --disable-warnings --html=driver_report.html -v tests/test_drivers.py -n auto {posargs} @@ -66,7 +61,6 @@ render_collapsed = all [testenv:makesupported] allowlist_externals = git -deps = - -rtest-requirements.txt +extras = test commands = python chirp/share/make_supported.py model_support.html