Merge branch 'master' into 0.2.0.rc

MarkUsProject · Nov 12, 2020 · 04f0b02 · 04f0b02
2 parents 86130d7 + 69c2b23
commit 04f0b02
Show file tree

Hide file tree

Showing 7 changed files with 943 additions and 681 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,6 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
-# command to install dependencies
-install:
-  - pip install pytest
-  - pip install hypothesis
 # command to run tests
 script:
-  - pytest
+  - python setup.py test
diff --git a/Changelog.md b/Changelog.md
@@ -1,13 +1,17 @@
 # Changelog
 
-##[v0.1.1]
+## [v0.2.0]
+- Added new methods for adding and removing extra marks (#15)
+- Rewrite everything to use the requests library (#26)
+
+## [v0.1.1]
 - Fixed bug which caused file uploads to be PUT requests by default instead of POST (#22)
 
-##[v0.1.0]
+## [v0.1.0]
 - this release includes functions to call all API routes for MarkUs version 1.9.0 (#10, #12, #13, #14, #18)
 - updated documentation to give correct instructions for pip installation (#11)
 - made some functions private that should have been private initially (#17)
 
-##[v0.0.1]
+## [v0.0.1]
 - initial release!
 - this release includes functions to call all API routes for MarkUs version 1.8.0