From 78996b2ef6a3c649857c3ee79856407684972d86 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 17 May 2022 14:14:48 +0200 Subject: [PATCH 1/3] README fixes --- README.md | 6 +++--- requirements.txt | 2 +- tmtccmd | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d0d50c4..a79785d 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ and then run the `lint.py` script 1. Create virtual environment ```sh -python3 -m venv . +python3 -m venv venv ``` 2. Activate virtual environment ```sh -./Scripts/activate +. venv/bin/activate ``` 3. Install `tmtccmd` for virtual environment. `-e` for interactive installation. @@ -54,7 +54,7 @@ py -m venv . 2. Activate virtual environment ```sh -Scripts\activate.bat +venv\Scripts\activate.bat ``` 3. Install `tmtccmd` for virtual environment. `-e` for interactive installation. diff --git a/requirements.txt b/requirements.txt index 1907adc..64bc0a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tmtccmd>=2.1.0 +tmtccmd>=2.2.1 diff --git a/tmtccmd b/tmtccmd index 418bb7d..0895aae 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 418bb7dc5a91beb3a163d1ecf4b7c68f59b9115a +Subproject commit 0895aae63414cdca4a16c53028fe72401c1b50e0 From 86395ac6e71750d13434e286da4b5d319128b014 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 17 May 2022 14:28:17 +0200 Subject: [PATCH 2/3] added setup.cfg and setup.py file --- setup.cfg | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 12 ++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 setup.cfg create mode 100644 setup.py diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..c4fd97e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,51 @@ +[metadata] +name = tmtc +description = TMTC Commander EIVE +version = attr: config.__version__ +long_description = file: README.md +long_description_content_type = text/markdown +license = Apache-2.0 +author = Robin Mueller +author_email = muellerr@irs.uni-stuttgart.de +platform = any + +url = https://egit.irs.uni-stuttgart.de/eive/eive-tmtc +classifiers = + Development Status :: 5 - Production/Stable + Intended Audience :: Developers + License :: OSI Approved :: Apache Software License + Natural Language :: English + Operating System :: POSIX + Operating System :: Microsoft :: Windows + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Topic :: Communications + Topic :: Software Development :: Libraries + Topic :: Software Development :: Libraries :: Python Modules + Topic :: Scientific/Engineering + +[options] +install_requires = + tmtccmd >= 2.2.1 +packages = find: +python_requires = >=3.8 + +[options.extras_require] +mib = + +[flake8] +max-line-length = 100 +ignore = D203, W503 +exclude = + .git, + __pycache__, + docs/conf.py, + old, + build, + dist, + venv +max-complexity = 10 +extend-ignore = + # See https://github.com/PyCQA/pycodestyle/issues/373 + E203, diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..77392bf --- /dev/null +++ b/setup.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 +""" +We do the package handling in the static setup.cfg but include an empty setup.py +to allow editable installs https://packaging.python.org/tutorials/packaging-projects/ +and provide extensibility +""" +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +setup() From a9efd5c86dfee415e6efd2af033d55ad1e749c1e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 17 May 2022 14:28:36 +0200 Subject: [PATCH 3/3] delete requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 64bc0a4..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -tmtccmd>=2.2.1