diff --git a/.gitignore b/.gitignore index 5d70c70..2e1ee9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,138 @@ -**/*.pyc \ No newline at end of file +**/*.pyc# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +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 +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ diff --git a/src/calc.py b/src/calc.py index 88a9524..f2a16e6 100644 --- a/src/calc.py +++ b/src/calc.py @@ -18,14 +18,3 @@ def sub(a, b): ``` """ return a - b - - -def mult(a, b): - """ - Multiply some numbers - - ```py - mult(8, 3) # 24 - ``` - """ - return a * b \ No newline at end of file diff --git a/src/calc_test.py b/src/calc_test.py index df364a2..d06621a 100644 --- a/src/calc_test.py +++ b/src/calc_test.py @@ -1,5 +1,5 @@ import unittest -from calc import add, sub, mult +from calc import add, sub class TestStringMethods(unittest.TestCase): @@ -11,9 +11,5 @@ def test_sub_2arg(self): # Make sure 4 - 3 = 1 self.assertEqual(sub(4, 3), 1, 'subtracting three from four') - def test_mult_2arg(self): - # Make sure 4 * 3 = 12 - self.assertEqual(mult(4, 3), 12, 'multiplying three and four') - if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main() diff --git a/src/main.py b/src/main.py index 9e6f84b..2321f0c 100644 --- a/src/main.py +++ b/src/main.py @@ -4,4 +4,4 @@ def main(): x = add(3, sub(7, 2)) return x -print('Result = {}'.format(main())) \ No newline at end of file +print('Result = {}'.format(main()))