Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitignore # Makefile # README.md # pytest.ini # requirements.txt # requirements_freeze.txt
leap-ec · Jun 14, 2020 · b7c7e9a · b7c7e9a
2 parents 40b2e81 + 45b7b97
commit b7c7e9a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,9 @@ docs/build/
 .coverage
 htmlcov/
 .ipynb_checkpoints/
+.pytest_cache
+build/
+dist/
 
 #Subversion
 .svn