Skip to content

Commit d1de9b7

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main'
2 parents f9026aa + b36fbeb commit d1de9b7

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ pip-log.txt
3838
pip-delete-this-directory.txt
3939

4040
# Unit test / coverage reports
41-
htmlcov/
4241
.tox/
4342
.nox/
4443
.coverage
@@ -127,4 +126,4 @@ dmypy.json
127126
# Pyre type checker
128127
.pyre/
129128
.DS_Store
130-
htmlcov/
129+
htmlcov/

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ run-test:
3636

3737
.PHONY: run-test-coverage
3838
run-test-coverage:
39-
$(COVERAGE) -v --cov-report=html:$(DEMO)/A0/hello/htmlcov --cov-report=term --cov=$(DEMO)/A0/hello $(DEMO)/A0/hello/tests
40-
$(COVERAGE) -v --cov-report=html:$(DEMO)/A0-OOP/hello/htmlcov --cov-report=term --cov=$(DEMO)/A0-OOP/hello $(DEMO)/A0-OOP/hello/tests
41-
$(COVERAGE) -v --cov-report=html:$(DEMO)/A1/cold/htmlcov --cov-report=term --cov=$(DEMO)/A1/cold $(DEMO)/A1/cold/tests
42-
$(COVERAGE) -v --cov-report=html:$(DEMO)/A1-OOP/cold/htmlcov --cov-report=term --cov=$(DEMO)/A1-OOP/cold $(DEMO)/A1-OOP/cold/tests
43-
$(COVERAGE) -v --cov-report=html:$(DEMO)/A2-ABC/egypt/htmlcov --cov-report=term --cov=$(DEMO)/A2-ABC/egypt $(DEMO)/A2-ABC/egypt/tests
39+
$(COVERAGE) -v --cov-report=term-missing --cov=$(DEMO)/A0/hello $(DEMO)/A0/hello/tests
40+
$(COVERAGE) -v --cov-report=term-missing --cov=$(DEMO)/A0-OOP/hello $(DEMO)/A0-OOP/hello/tests
41+
$(COVERAGE) -v --cov-report=term-missing --cov=$(DEMO)/A1/cold $(DEMO)/A1/cold/tests
42+
$(COVERAGE) -v --cov-report=term-missing --cov=$(DEMO)/A1-OOP/cold $(DEMO)/A1-OOP/cold/tests
43+
$(COVERAGE) -v --cov-report=term-missing --cov=$(DEMO)/A2-ABC/egypt $(DEMO)/A2-ABC/egypt/tests
4444

4545
.PHONY: clean
4646
clean:

demo-assignments/A0-OOP/hello/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ run-test-coverage: create-doc-folder
2929
pytest --verbose --color=yes --cov --cov-report term-missing --cov-report=html:$(DOCS)/test-cov tests/
3030
@echo "All unittests passed!"
3131

32-
3332
.PHONY: check-types
3433
check-types:
3534
# use shell command which to check if mypy is installed and is in $PATH
@@ -46,6 +45,7 @@ create-doc-folder:
4645

4746
.PHONY: create-docs
4847
create-docs: create-doc-folder
48+
# provide each module name; current path . not working!
4949
pdoc --output-dir $(DOCS)/code-docs hello.py main.py # creates html docs
5050
@echo "html docs created and saved in $(DOCS)/code-docs"
5151

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Module hello
2+
============
3+
Hello World Program using OOP
4+
5+
Classes
6+
-------
7+
8+
`HelloWorld()`
9+
: Hello World Class
10+
11+
Constructor
12+
13+
### Instance variables
14+
15+
`message: str`
16+
: Returns the message - using getter property
17+
18+
Returns:
19+
self._message (str): Message stored in the object
20+
21+
### Methods
22+
23+
`get_message(self) ‑> str`
24+
: Returns the message - using getter method
25+
26+
Returns:
27+
self._message (str): Message stored in the object
28+
29+
`print_message(self) ‑> None`
30+
: Prints the message

0 commit comments

Comments
 (0)