Merge branch 'master' into bugfix/html-images

4 files changed, 24 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a05abc..b727cb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 0.6.3
+
+* Properly resolve image urls in HTML sources 
+  ([#45](https://github.com/GjjvdBurg/paper2remarkable/issues/45)). Thanks to 
+  @sirupsen.
+* Allow ``+`` in urls
+
 ## Version 0.6.2
 
 * Print to log whether removing arXiv stamp was successful.
diff --git a/README.md b/README.md
index c74ffe4..e23c1a3 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ usage: p2r [-h] [-b] [-c] [-d] [-n] [-p REMARKABLE_DIR] [-r] [-k] [-v] [-V]
            [--pdftk PDFTK] [--qpdf QPDF] [--rmapi RMAPI]
            input
 
-Paper2reMarkable version 0.6.2
+Paper2reMarkable version 0.6.3
 
 positional arguments:
   input                 URL to a paper or the path of a local PDF file
diff --git a/make_release.py b/make_release.py
index cb4af59..b0c01d1 100644
--- a/make_release.py
+++ b/make_release.py
@@ -15,6 +15,7 @@ Date: 2019-07-23
 import colorama
 import os
 import sys
+import tempfile
 
 
 def colored(msg, color=None, style=None):
@@ -52,11 +53,12 @@ def get_package_name():
         )
         return nameline.split("=")[-1].strip().strip('"')
 
+
 def get_package_version(pkgname):
     ctx = {}
     with open(f"{pkgname.lower()}/__version__.py", "r") as fp:
         exec(fp.read(), ctx)
-    return ctx['__version__']
+    return ctx["__version__"]
 
 
 class Step:
@@ -118,7 +120,7 @@ class RunTests(Step):
 class BumpVersionPackage(Step):
     def action(self, context):
         self.instruct(f"Update __version__.py with new version")
-        self.print_run(f"vi {context['pkgname']}/__version__.py")
+        self.do_cmd(f"vi {context['pkgname']}/__version__.py")
 
     def post(self, context):
         wait_for_enter()
@@ -126,7 +128,7 @@ class BumpVersionPackage(Step):
 
     def _get_version(self, context):
         # Get the version from the version file
-        return get_package_version(context['pkgname'])
+        return get_package_version(context["pkgname"])
 
 
 class MakeClean(Step):
@@ -153,15 +155,14 @@ class PushToTestPyPI(Step):
 
 class InstallFromTestPyPI(Step):
     def action(self, context):
-        self.print_run("cd /tmp/")
-        self.print_cmd("rm -rf ./venv")
-        self.print_cmd("virtualenv ./venv")
-        self.print_cmd("cd ./venv")
-        self.print_cmd("source bin/activate")
-        self.print_cmd(
+        tmpvenv = tempfile.mkdtemp(prefix="p2r_venv_")
+        self.do_cmd(
+            f"virtualenv {tmpvenv} && source {tmpvenv}/bin/activate && "
             "pip install --index-url https://test.pypi.org/simple/ "
-            + f"--extra-index-url https://pypi.org/simple {context['pkgname']}=={context['version']}"
+            "--extra-index-url https://pypi.org/simple "
+            f"{context['pkgname']}=={context['version']}"
         )
+        context["tmpvenv"] = tmpvenv
 
 
 class TestPackage(Step):
@@ -169,13 +170,12 @@ class TestPackage(Step):
         self.instruct(
             f"Ensure that the following command gives version {context['version']}"
         )
-        self.print_run(f"p2r -V")
+        self.do_cmd(f"source {context['tmpvenv']}/bin/activate && p2r -V")
 
 
-class DeactivateVenv(Step):
+class RemoveVenv(Step):
     def action(self, context):
-        self.print_run("deactivate")
-        self.instruct("Go back to the project directory")
+        self.do_cmd(f"rm -rf {context['tmpvenv']}")
 
 
 class GitTagVersion(Step):
@@ -235,7 +235,7 @@ def main(target=None):
         ("testpypi", PushToTestPyPI()),
         ("install", InstallFromTestPyPI()),
         ("testpkg", TestPackage()),
-        ("deactivate", DeactivateVenv()),
+        ("remove_venv", RemoveVenv()),
         ("gitadd2", GitAdd()),
         ("pypi", PushToPyPI()),
         ("tag", GitTagVersion()),
diff --git a/paper2remarkable/__version__.py b/paper2remarkable/__version__.py
index 68746e4..e6d205f 100644
--- a/paper2remarkable/__version__.py
+++ b/paper2remarkable/__version__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-VERSION = (0, 6, 2)
+VERSION = (0, 6, 3)
 
 __version__ = ".".join(map(str, VERSION))