Switched to Makefile

Author: gitandy

Makefile

@@ -0,0 +1,74 @@
+PYTHON = python
+PIP = pip
+VENV_DIR = venv
+
+VER = $(shell git describe --tags)
+VERSION = $(firstword $(subst -, ,$(VER)))
+ifeq ($(shell git diff --name-only),)
+UNCLEAN = "False"
+else
+UNCLEAN = "True"
+endif
+
+BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
+
+ifeq ($(OS),Windows_NT)
+VENV_BIN = $(VENV_DIR)/Scripts
+PIP = $(VENV_BIN)/pip.exe
+FLAKE8 = $(VENV_BIN)/flake8.exe
+ifeq ($(shell if test -d $(VENV_DIR); then echo "exist";fi),exist)
+PYTHON = $(VENV_BIN)/python.exe
+endif
+else
+VENV_BIN = $(VENV_DIR)/bin
+PIP = $(VENV_BIN)/pip
+FLAKE8 = $(VENV_BIN)/flake8
+ifeq ($(shell if test -d $(VENV_DIR); then echo "exist";fi),exist)
+PYTHON = $(VENV_BIN)/python
+endif
+endif
+
+NO_OBSOLETE=
+
+all:  src/adif_file/__version__.py
+
+src/adif_file/__version__.py:
+	echo __version__ = \'$(VERSION)\' > $@
+	echo __version_str__ = \'$(VER)\' >> $@
+	echo __branch__ = \'$(BRANCH)\' >> $@
+	echo __unclean__ = $(UNCLEAN) >> $@
+
+dist: clean all test
+	$(PYTHON) -m pip install --upgrade pip;
+	$(PYTHON) -m pip install --upgrade build;
+	$(PYTHON) -m build;
+
+release:
+	$(PYTHON) -m pip install --upgrade twine;
+	$(PYTHON) -m twine upload dist/*;
+
+test: all
+	$(FLAKE8) ./src --count --select=E9,F63,F7,F82 --show-source --statistics
+	$(FLAKE8) ./src --count --max-complexity=15 --max-line-length=120 --statistics
+	PYTHONPATH=./src $(PYTHON) -m unittest discover -s ./test
+
+build_devenv:
+	if [ ! -d $(VENV_DIR) ]; then \
+		$(PYTHON) -m venv $(VENV_DIR); \
+		$(PIP) install --upgrade pip setuptools wheel; \
+		$(PIP) install -r requirements.txt; \
+	else \
+		echo "Virtualenv $(VENV_DIR) already exists"; \
+	fi
+
+.PHONY: src/adif_file/__version__.py test clean_devenv build_devenv
+
+clean:
+	rm -rf build
+	rm -rf dist
+	rm -f src/hamcc/__version__.py
+	rm -f
+
+clean_devenv:
+	rm -r venv
+

build.bat

@@ -0,0 +1,5 @@
+@echo off
+set PATH=C:\cygwin64\bin;%PATH%
+
+echo Invoking make %* ...
+make.exe %*

build.sh

@@ -1,2 +1,3 @@
 xmlschema~=2.5.0
-xmltodict~=0.13.0
+xmltodict~=0.13.0
+flake8

make.bat

@@ -1,10 +1,10 @@
 """Convert ADIF ADI/ADX content to dictionary and vice versa"""
 
-from adif_file.__version__ import __version__ as __version_str__
+from adif_file.__version__ import __version__, __version_str__  # noqa: F401
 
 __author_name__ = 'Andreas Schawo, DF1ASC'
 __author_email__ = 'andreas@schawo.de'
 __copyright__ = 'Copyright 2023-2024 by Andreas Schawo,licensed under CC BY-SA 4.0'
 __proj_name__ = 'PyADIF-File'
-__version__ = __version_str__[1:].split('-')[0]
+__version__ = __version__[1:]
 __description__ = 'Convert ADIF ADI/ADX content to dictionary and vice versa'

requirements.txt

@@ -5,10 +5,7 @@
 import datetime
 from collections.abc import Iterator
 
-from adif_file.__version__ import __version__ as __version_str__
-
-__proj_name__ = 'PyADIF-File'
-__version__ = __version_str__[1:].split('-')[0]
+from . import __version_str__, __proj_name__
 
 
 class TooMuchHeadersException(Exception):
@@ -215,7 +212,7 @@ def dumpi(data_dict: dict, comment: str = 'ADIF export by ' + __proj_name__,
     if 'HEADER' in data_dict:
         default = {'ADIF_VER': '3.1.4',
                    'PROGRAMID': __proj_name__,
-                   'PROGRAMVERSION': __version__,
+                   'PROGRAMVERSION': __version_str__,
                    'CREATED_TIMESTAMP': datetime.datetime.utcnow().strftime('%Y%m%d %H%M%S')
                    # TODO: Fix deprication > 3.10: datetime.datetime.now(tz=datetime.UTC).strftime('%Y%m%d %H%M%S')
                    }

src/adif_file/__init__.py

@@ -10,10 +10,7 @@
 import xmlschema
 import xmltodict
 
-from adif_file.__version__ import __version__ as __version_str__
-
-__proj_name__ = 'PyADIF-File'
-__version__ = __version_str__[1:].split('-')[0]
+from . import __version_str__, __proj_name__
 
 ADX_EXPORT_SCHEMA = xmlschema.XMLSchema(os.path.join(os.path.dirname(__file__), 'xsd/adx314.xsd'))
 ADX_IMPORT_SCHEMA = xmlschema.XMLSchema(os.path.join(os.path.dirname(__file__), 'xsd/adx314generic.xsd'))
@@ -55,10 +52,9 @@ def loads(adx_data: str, validate: bool = False) -> dict:
             raise MalformedValueException(f'Field "{exc.elem.tag}": {exc.reason}') from None
 
     try:
-        data_dict = xmltodict.parse(adx_data, cdata_key='$')
-        data_dict = data_dict['ADX']
-        if ('RECORDS' in data_dict and data_dict['RECORDS'] and
-                'RECORD' in data_dict['RECORDS'] and data_dict['RECORDS']['RECORD']):
+        data_dict = xmltodict.parse(adx_data, cdata_key='$')['ADX']
+        if all(('RECORDS' in data_dict, bool(data_dict['RECORDS']),
+               'RECORD' in data_dict['RECORDS'], bool(data_dict['RECORDS']['RECORD']))):
             data_dict['RECORDS'] = data_dict['RECORDS']['RECORD']
         else:
             data_dict['RECORDS'] = []
@@ -98,7 +94,7 @@ def dump(file_name: str, data_dict: dict, raise_exc=True) -> list[Exception]:
     header = {
         'ADIF_VER': '3.1.4',
         'PROGRAMID': __proj_name__,
-        'PROGRAMVERSION': __version__,
+        'PROGRAMVERSION': __version_str__,
         'CREATED_TIMESTAMP': datetime.datetime.utcnow().strftime('%Y%m%d %H%M%S')
     }