Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOCUMENTATION] Prototype documentation build glue #110

Merged
merged 31 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
dc6693f
[DOCUMENTATION] Prototype documentation features via sphinx (- WIP #7…
reactive-firewall Sep 16, 2024
66b6457
[DOCUMENTATION] debugged sphinx build features some more (- WIP #110 -)
reactive-firewall Sep 16, 2024
afe6b2b
[HOTFIX] Fixup .gitignore file
reactive-firewall Sep 16, 2024
cb78e82
[DOCUMENTATION] updated documentation configuration a bit. (- WIP #11…
reactive-firewall Sep 16, 2024
8242763
[DOCUMENTATION] Fixed GH links for project and updated some docs (- W…
reactive-firewall Sep 17, 2024
a645bb2
[DOCUMENTATION] Improved Documentation hopefully (- WIP #104 & #110 -)
reactive-firewall Sep 17, 2024
e5a9b5a
[REGRESSION] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 17, 2024
0cefdee
[DOCUMENTATION] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 17, 2024
ef3987f
Apply suggestions from code review
reactive-firewall Sep 17, 2024
c96e696
[STYLE] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 17, 2024
d70813d
[PATCH] More Fixes
reactive-firewall Sep 17, 2024
decc298
[DOCUMENTATION] CI documentation tweaks (- WIP #110 -)
reactive-firewall Sep 17, 2024
d66b9bf
Apply MORE suggestions from code review
reactive-firewall Sep 17, 2024
24f4f60
[STYLE] Refactored some unrelated code for style compliance (- WIP #5…
reactive-firewall Sep 17, 2024
467473f
[DOCUMENTATION] Clearified setup the label from 'set up' the words (-…
reactive-firewall Sep 17, 2024
50ca492
[STYLE] added Copyright line to source docs (- WIP #110 -)
reactive-firewall Sep 17, 2024
8f12b75
Update docs/USAGE.md
reactive-firewall Sep 17, 2024
4a01fa5
[TESTING] Re-enabling test blocking for style and adding docs/require…
reactive-firewall Sep 18, 2024
83e03d2
[TESTING] Fixup for CI env where documentation gaps caused failures (…
reactive-firewall Sep 18, 2024
8ab47e0
[UPGRADE] fixed spellcheck tool (- WIP #111 -)
reactive-firewall Sep 18, 2024
da0a7fd
[TESTING] fixup for CI with deepsource coverage (- WIP #110 -)
reactive-firewall Sep 18, 2024
1d5900f
[TESTS] used new tests/check_spelling tool to auto-fix spelling in te…
reactive-firewall Sep 18, 2024
e485acc
[DOCUMENTATION] used new tests/check_spelling tool to fixup the docs …
reactive-firewall Sep 18, 2024
54e6fd2
[STYLE] Finished fixing with new tests/check_spelling tool (- WIP #11…
reactive-firewall Sep 18, 2024
4daa0b2
[STYLE] corrected v-array to intended vary in comment (- WIP #110 -)
reactive-firewall Sep 18, 2024
dacd7c0
[PATCH] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 18, 2024
149aa09
[HOTFIX] fixed CI regression by false-positive spelling correction (-…
reactive-firewall Sep 18, 2024
648a3cb
[PATCH] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 18, 2024
4d7b943
[UPDATE] Bump Version in prep of release (- WIP #110 -)
reactive-firewall Sep 18, 2024
85d6617
[STYLE] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 18, 2024
a801c21
[PATCH] Apply suggestions from code review (- WIP #110 -)
reactive-firewall Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run:
shell: /bin/bash
name: "setup depends"
name: "set up depends"
command: |
python3 -m pip install --upgrade --user -r ./requirements.txt || : ;
when: on_success
Expand Down
26 changes: 17 additions & 9 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
LANG: ${{ matrix.lang-var }}
steps:
- uses: actions/checkout@v4
- name: Setup Python
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Setup dependencies
- name: Set up dependencies
run: |
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install -r ./requirements.txt ;
Expand Down Expand Up @@ -145,7 +145,7 @@
LANG: "en_US.utf-8"
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand All @@ -154,6 +154,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install -r ./requirements.txt ;
pip install -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -191,9 +192,10 @@
COV_CORE_DATAFILE: ./coverage.xml
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
DEEPSOURCE_DSN: ${{ secrets.DEEPSOURCE_DSN }}
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand All @@ -202,6 +204,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install -r ./requirements.txt ;
pip install -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
Expand Down Expand Up @@ -273,9 +276,10 @@
COV_CORE_DATAFILE: ./coverage.xml
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
DEEPSOURCE_DSN: ${{ secrets.DEEPSOURCE_DSN }}
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand All @@ -284,6 +288,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install --upgrade -r ./requirements.txt ;
pip install --upgrade -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
Expand Down Expand Up @@ -349,7 +354,7 @@

steps:
- uses: actions/checkout@v4
- name: Setup Python
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
Expand All @@ -358,6 +363,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install --upgrade -r ./requirements.txt ;
pip install --upgrade -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -393,7 +399,7 @@
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand All @@ -402,6 +408,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install --upgrade -r ./requirements.txt ;
pip install --upgrade -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} != "Linux"
run: |
Expand Down Expand Up @@ -440,7 +447,7 @@
fail_ci_if_error: false
- name: Upload Extra Python ${{ matrix.python-version }} Artifact
uses: actions/upload-artifact@v4
with:

Check warning on line 450 in .github/workflows/Tests.yml

View workflow job for this annotation

GitHub Actions / INTEGRATION (ubuntu-latest, 3.10)

SKIPPED

SKIP Code-Climate

Check warning on line 450 in .github/workflows/Tests.yml

View workflow job for this annotation

GitHub Actions / INTEGRATION (ubuntu-latest, 3.11)

SKIPPED

SKIP Code-Climate

Check warning on line 450 in .github/workflows/Tests.yml

View workflow job for this annotation

GitHub Actions / INTEGRATION (ubuntu-latest, 3.12)

SKIPPED

SKIP Code-Climate
name: Integration-Test-Report-${{ matrix.os }}-${{ matrix.python-version }}
path: ./test-reports/
if-no-files-found: ignore
Expand Down Expand Up @@ -490,7 +497,7 @@
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -551,7 +558,7 @@

steps:
- uses: actions/checkout@v4
- name: Setup Python
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.12"
Expand All @@ -564,6 +571,7 @@
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "build>=1.0.1";
pip install --upgrade -r ./requirements.txt ;
pip install --upgrade -r ./tests/requirements.txt || true ;
pip install --upgrade -r ./docs/requirements.txt || true ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,10 @@ ENV/
*.xcodeproj
*.xcodeproj/*

# Project Specific
_build/
docs/_build/
docs/www/
docs/make.bat
multicast/multicast/**
tests/tests/**
54 changes: 32 additions & 22 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
License - MIT
# MIT License

Copyright (c) 2017-2024, Mr. Walls

Expand All @@ -22,39 +22,49 @@ copies or substantial portions of the Software.



END MIT License
***

Included Licenses and additional Acknowledgments included with package:
## Included Licenses and additional Acknowledgments included with package

Files: `tests/context.py`, `tests/test_basic.py`, and `tests/test_usage.py`
..........................................
* Files: `tests/context.py`, `tests/test_basic.py`, and `tests/test_usage.py`
***
Copyright (c) 2017-2022, Python Test Repo Template
ALSO Licensed under MIT
You may obtain a copy of the License at
http://www.github.com/reactive-firewall/python-repo/LICENSE.md
..........................................
[MIT License](http://www.github.com/reactive-firewall/python-repo/LICENSE.md)
***

Third-party Acknowledgments:
## Third-party Acknowledgments

Files: `multicast/send.py` and `multicast/recv.py`
..........................................
Some code (namely: run, and parseArgs) was modified/derived from:
https://stackoverflow.com/a/52791404
Copyright (c) 2019, "pterodragon" (https://stackoverflow.com/users/5256940/pterodragon)
* Files: `multicast/send.py` and `multicast/recv.py`
***
Some code (namely: run, and parseArgs) was modified/derived from
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
[This answer on stackoverflow](https://stackoverflow.com/a/52791404)
Copyright (c) 2019, ["pterodragon"](https://stackoverflow.com/users/5256940/pterodragon)
which was under CC-by-sa-4 license.
see https://creativecommons.org/licenses/by-sa/4.0/ for details
See [CC-by-sa-4](https://creativecommons.org/licenses/by-sa/4.0/) for details.
The code in `parseArgs`, `run`, and `main` are thus also under
CC-by-sa-4
see https://creativecommons.org/licenses/by-sa/4.0/ for details
..........................................
See [CC-by-sa-4](https://creativecommons.org/licenses/by-sa/4.0/) for details.
***
NO ASSOCIATION

Files: `tests/profiling.py`
..........................................
Some code (namely: class timewith, @do_cprofile, @do_line_profile) was modified/derived from:
https://github.com/zapier/profiling-python-like-a-boss/tree/1ab93a1154
* Files: `tests/profiling.py`
***
Some code (namely: class timewith, @do_cprofile, @do_line_profile) was modified/derived from
[profiling-python-like-a-boss](https://github.com/zapier/profiling-python-like-a-boss/tree/1ab93a1154)
Copyright (c) 2013, Zapier Inc. All rights reserved.
which was under BSD-3 Clause license.
see https://github.com/zapier/profiling-python-like-a-boss/blob/1ab93a1154/LICENSE.md for details
..........................................
See [BSD-3 Clause license](https://github.com/zapier/profiling-python-like-a-boss/blob/1ab93a1154/LICENSE.md) for details.
***
NO ASSOCIATION

* Files: `docs/config.py`
***
Some code (namely: Sphinx setup output config) was modified/derived from
[Sphinx documentation](https://github.com/sphinx-doc/sphinx/blob/569fde84d49c984282355c768c16426af83132e2/doc/conf.py)
Copyright (c) 2007-2024 by the Sphinx team. All rights reserved.
which was under BSD-2 Clause license.
See [BSD License](https://github.com/sphinx-doc/sphinx/blob/569fde84d49c984282355c768c16426af83132e2/LICENSE.rst) for details.
***
NO ASSOCIATION
32 changes: 27 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ endif

ifndef PIP_COMMON_FLAGS
# Define common pip install flags
PIP_COMMON_FLAGS := --use-pep517 --upgrade --upgrade-strategy eager
PIP_COMMON_FLAGS := --use-pep517 --exists-action s --upgrade --upgrade-strategy eager
endif

# Define environment-specific pip install flags
Expand Down Expand Up @@ -139,7 +139,7 @@ ifeq "$(RMDIR)" ""
RMDIR=$(RM)Rd
endif

PHONY: cleanup init must_be_root must_have_flake must_have_pytest uninstall
.PHONY: cleanup init clean-docs must_be_root must_have_flake must_have_pytest uninstall

build: init ./setup.py
$(QUIET)$(PYTHON) -W ignore -m build --sdist --wheel --no-isolation ./ || $(QUIET)$(PYTHON) -W ignore -m build ./ ;
Expand Down Expand Up @@ -173,6 +173,7 @@ purge: clean uninstall

test: cleanup
$(QUIET)$(COVERAGE) run -p --source=multicast -m unittest discover --verbose --buffer -s ./tests -t $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) || $(PYTHON) -m unittest discover --verbose --buffer -s ./tests -t ./ || DO_FAIL="exit 2" ;
$(QUITE)$(WAIT) ;
$(QUIET)$(DO_FAIL) ;
$(QUIET)$(COVERAGE) combine 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(COVERAGE) report -m --include=* 2>$(ERROR_LOG_PATH) || : ;
Expand All @@ -190,14 +191,20 @@ test-reports:
test-reqs: test-reports init
$(QUIET)$(PYTHON) -m pip install $(PIP_COMMON_FLAGS) $(PIP_ENV_FLAGS) -r tests/requirements.txt 2>$(ERROR_LOG_PATH) || true

docs-reqs: ./docs/ ./docs/requirements.txt init
$(QUIET)$(PYTHON) -m pip install $(PIP_COMMON_FLAGS) $(PIP_ENV_FLAGS) -r docs/requirements.txt 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(WAIT) ;

test-pytest: cleanup must_have_pytest test-reports
$(QUIET)$(PYTHON) -m pytest --cache-clear --doctest-glob=multicast/*.py,tests/*.py --doctest-modules --cov=. --cov-append --cov-report=xml --junitxml=test-reports/junit.xml -v --rootdir=. || DO_FAIL="exit 2" ;
$(QUITE)$(WAIT) ;
$(QUIET)$(DO_FAIL) ;
$(QUIET)$(ECHO) "$@: Done."

test-style: cleanup must_have_flake
$(QUIET)$(PYTHON) -m flake8 --ignore=W191,W391 --max-line-length=100 --verbose --count --config=.flake8.ini --show-source || true
$(QUIET)$(PYTHON) -m flake8 --ignore=W191,W391 --max-line-length=100 --verbose --count --config=.flake8.ini --show-source || DO_FAIL="exit 2" ;
$(QUITE)$(WAIT) ;
$(QUIET)$(DO_FAIL) ;
$(QUIET)tests/check_spelling || true
$(QUIET)tests/check_cc_lines || true
$(QUIET)$(ECHO) "$@: Done."
Expand Down Expand Up @@ -254,12 +261,27 @@ cleanup:
$(QUIET)$(RMDIR) ./.tox/ 2>$(ERROR_LOG_PATH) || true
$(QUIET)$(WAIT) ;

build-docs: ./docs/ ./docs/Makefile docs-reqs
$(QUIET)$(MAKE) -s -C ./docs/ -f Makefile html 2>$(ERROR_LOG_PATH) || DO_FAIL="exit 2" ;
$(QUIET)$(WAIT) ;
$(QUIET)mkdir $(INST_OPTS) ./docs/www 2>$(ERROR_LOG_PATH) >$(ERROR_LOG_PATH) || : ;
$(QUIET)$(BSMARK) ./docs/www 2>$(ERROR_LOG_PATH) >$(ERROR_LOG_PATH) || : ;
$(QUIET)$(WAIT) ;
$(QUIET)cp -fRp ./docs/_build/ ./docs/www/ 2>$(ERROR_LOG_PATH) || DO_FAIL="exit 35" ;
$(QUIET)$(WAIT) ;
$(QUIET)$(MAKE) -s -C ./docs/ -f Makefile clean 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(WAIT) ;
$(QUIET)$(ECHO) "Documentation should be in docs/www/html/"
$(QUIET)$(DO_FAIL) ;

clean-docs: ./docs/ ./docs/Makefile
$(QUIET)$(MAKE) -s -C ./docs/ -f Makefile clean 2>$(ERROR_LOG_PATH) || true
$(QUIET)$(RM) ./docs/www/* 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(RMDIR) ./docs/www/ 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(MAKE) -s -C ./docs/ -f Makefile clean 2>$(ERROR_LOG_PATH) || : ;
$(QUIET)$(WAIT) ;

./docs/:
$(QUIET)$(WAIT) ;
$(QUIET) : ;

./docs/Makefile: ./docs/
$(QUIET)$(WAIT) ;
Expand Down
Loading
Loading