Merge branch 'hotfix-general_stuff' of https://github.com/wboxx1/ante…

…nna-intensity-modeler into hotfix-general_stuff

.gitignore

@@ -21,9 +21,11 @@ parts/
 sdist/
 var/
 wheels/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -38,6 +40,7 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
@@ -46,6 +49,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -66,11 +70,16 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
 .python-version
 
@@ -87,6 +96,11 @@ celerybeat-schedule
 .venv
 venv/
 ENV/
+.env
+env/
+ENV/
+env.bak/
+venv.bak
 
 # Spyder project settings
 .spyderproject
@@ -100,4 +114,31 @@ ENV/
 
 # mypy
 .mypy_cache/
-alabaster
+.dmypy.json
+dmypy.json
+alabaster
+
+# VSCode
+.vscode/
+
+# local ignores
+DARC.py
+DARC2.py
+DARC3.py
+DARC4.py
+DARC5.py
+limit_line_0.9_angle_0.csv
+limit_line_0.9_angle_5.csv
+limit_line_10.0_angle_0.csv
+limit_line_10.0_angle_5.csv
+limit_line_14.9_angle_0.csv
+limit_line_14.9_angle_5.csv
+limit_line_38.2_angle_0.csv
+limit_line_38.2_angle_5.csv
+limit_line_100.0_angle_0.csv
+limit_line_100.0_angle_5.csv
+limit_line_128.4_angle_0.csv
+limit_line_128.4_angle_5.csv
+limitation_line_angle_0.csv
+limitation_line_angle_5.csv
+test.py

.vscode/settings.json

@@ -1,7 +1,8 @@
-{
-    "python.pythonPath": "C:\\Users\\SCYT\\Anaconda3\\envs\\py36\\python.exe",
-    "deepcode.review.results.hideInformationIssues": false,
-    "python.linting.pylintEnabled": true,
-    "python.linting.pycodestyleEnabled": false,
-    "python.linting.enabled": true
+{
+    "python.pythonPath": "/home/wboxx1/miniconda3/envs/datascience/bin/python",
+    "python.linting.pylintEnabled": true,
+    "python.linting.pycodestyleEnabled": false,
+    "python.linting.enabled": true,
+    "python.formatting.provider": "black",
+    "deepcode.uploadApproved": true
 }

Makefile

@@ -1,92 +1,92 @@
-.PHONY: clean clean-test clean-pyc clean-build docs help
-.DEFAULT_GOAL := help
-
-define BROWSER_PYSCRIPT
-import os, webbrowser, sys
-
-try:
-	from urllib import pathname2url
-except:
-	from urllib.request import pathname2url
-
-webbrowser.open("file://" + pathname2url(os.path.abspath(sys.argv[1])))
-endef
-export BROWSER_PYSCRIPT
-
-define PRINT_HELP_PYSCRIPT
-import re, sys
-
-for line in sys.stdin:
-	match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
-	if match:
-		target, help = match.groups()
-		print("%-20s %s" % (target, help))
-endef
-export PRINT_HELP_PYSCRIPT
-
-BROWSER := python -c "$$BROWSER_PYSCRIPT"
-
-help:
-	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
-
-clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
-
-clean-build: ## remove build artifacts
-	rm -fr build/
-	rm -fr dist/
-	rm -fr .eggs/
-	find . -name '*.egg-info' -exec rm -fr {} +
-	find . -name '*.egg' -exec rm -f {} +
-
-clean-pyc: ## remove Python file artifacts
-	find . -name '*.pyc' -exec rm -f {} +
-	find . -name '*.pyo' -exec rm -f {} +
-	find . -name '*~' -exec rm -f {} +
-	find . -name '__pycache__' -exec rm -fr {} +
-
-clean-test: ## remove test and coverage artifacts
-	rm -fr .tox/
-	rm -f .coverage
-	rm -fr htmlcov/
-	rm -fr .pytest_cache
-
-lint: ## check style with flake8
-	flake8 antenna_intensity_modeler tests
-
-test: ## run tests quickly with the default Python
-	poetry run pytest --cov=src/antenna_intensity_modeler tests/
-
-test-all: ## run tests on every Python version with tox
-	poetry run tox
-
-coverage: ## check code coverage quickly with the default Python
-	poetry run coverage run --source src/antenna_intensity_modeler -m pytest
-	poetry run coverage report -m
-	poetry run coverage html
-	poetry run $(BROWSER) htmlcov/index.html
-
-docs: ## generate Sphinx HTML documentation, including API docs
-	rm -f docs/antenna_intensity_modeler.rst
-	rm -f docs/modules.rst
-	sphinx-apidoc -o docs/ src/antenna_intensity_modeler
-	$(MAKE) -C docs clean
-	$(MAKE) -C docs html
-	$(BROWSER) docs/_build/html/index.html
-
-servedocs: docs ## compile the docs watching for changes
-	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
-
-release: dist ## package and upload a release
-	poetry publish
-
-dist: clean ## builds source and wheel package
-	poetry build
-
-install: clean ## install the package to the active Python's site-packages
-	poetry install
-
-version-major:
-	bump2version major
-
-version-minor:
-	bump2version minor
+.PHONY: clean clean-test clean-pyc clean-build docs help
+.DEFAULT_GOAL := help
+
+define BROWSER_PYSCRIPT
+import os, webbrowser, sys
+
+try:
+	from urllib import pathname2url
+except:
+	from urllib.request import pathname2url
+
+webbrowser.open(pathname2url(sys.argv[1]))
+endef
+export BROWSER_PYSCRIPT
+
+define PRINT_HELP_PYSCRIPT
+import re, sys
+
+for line in sys.stdin:
+	match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
+	if match:
+		target, help = match.groups()
+		print("%-20s %s" % (target, help))
+endef
+export PRINT_HELP_PYSCRIPT
+
+BROWSER := python -c "$$BROWSER_PYSCRIPT"
+
+help:
+	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
+
+clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
+
+clean-build: ## remove build artifacts
+	rm -fr build/
+	rm -fr dist/
+	rm -fr .eggs/
+	find . -name '*.egg-info' -exec rm -fr {} +
+	find . -name '*.egg' -exec rm -f {} +
+
+clean-pyc: ## remove Python file artifacts
+	find . -name '*.pyc' -exec rm -f {} +
+	find . -name '*.pyo' -exec rm -f {} +
+	find . -name '*~' -exec rm -f {} +
+	find . -name '__pycache__' -exec rm -fr {} +
+
+clean-test: ## remove test and coverage artifacts
+	rm -fr .tox/
+	rm -f .coverage
+	rm -fr htmlcov/
+	rm -fr .pytest_cache
+
+lint: ## check style with flake8
+	flake8 antenna_intensity_modeler tests
+
+test: ## run tests quickly with the default Python
+	poetry run pytest
+
+test-all: ## run tests on every Python version with tox
+	poetry run tox
+
+coverage: ## check code coverage quickly with the default Python
+	poetry run coverage run --source src/antenna_intensity_modeler -m pytest
+	poetry run coverage report -m
+	poetry run coverage html
+	poetry run $(BROWSER) htmlcov/index.html
+
+docs: ## generate Sphinx HTML documentation, including API docs
+	rm -f docs/antenna_intensity_modeler.rst
+	rm -f docs/modules.rst
+	sphinx-apidoc -M -o docs/ src/antenna_intensity_modeler
+	$(MAKE) -C docs clean
+	$(MAKE) -C docs html
+	$(BROWSER) docs/_build/html/index.html
+
+servedocs: docs ## compile the docs watching for changes
+	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
+
+release: dist ## package and upload a release
+	poetry publish
+
+dist: clean ## builds source and wheel package
+	poetry build
+
+install: clean ## install the package to the active Python's site-packages
+	poetry install
+
+version-major:
+	bump2version major
+
+version-minor:
+	bump2version minor

appveyor.yml

@@ -50,7 +50,7 @@ install:
   - sh: "pip install -U tox"
   - sh: "pip install -U poetry"
 
-build: false  # Not a C# project, build stuff at the test step instead.
+build: off  # Not a C# project, build stuff at the test step instead.
 
 test_script:
   - cmd: "%PYTHON%/Scripts/tox -e %TOX_ENV%"

docs/_build/html/.buildinfo

@@ -1,4 +1,4 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 556abe7c721910f6245712bea2d89b0a
-tags: 645f666f9bcd5a90fca523b33c5a78b7
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 9d5b790a11b3c00311d9ff23704107f6
+tags: 645f666f9bcd5a90fca523b33c5a78b7