Merge pull request #199 from AnswerDotAI/fix-deps

rm `GitPython` dep

Author: jph00

00_core.ipynb

@@ -36,7 +36,7 @@
     "from datetime import datetime, timedelta, timezone\n",
     "from pprint import pprint\n",
     "from time import sleep\n",
-    "import os, shutil, tempfile, git"
+    "import os, shutil, tempfile, subprocess"
    ]
   },
   {
@@ -1056,27 +1056,28 @@
    "source": [
     "#|export\n",
     "img_md_pat = re.compile(r'!\\[(?P<alt>.*?)\\]\\((?P<url>[^\\s]+)\\)')\n",
-    "def replace_md_imgs(content, func): return img_md_pat.sub(func, content)\n",
+    "\n",
+    "def _run_subp(cmd): \n",
+    "    r = subprocess.run(cmd, check=False, capture_output=True, text=True)\n",
+    "    if r.returncode != 0: raise RuntimeError(r.stderr)\n",
     "\n",
     "@patch\n",
     "def create_gist(self:GhApi, description, content, filename='gist.txt', public=False, img_paths=None):\n",
     "    'Create a gist, optionally with images where each md img url will be placed with img upload urls.'\n",
     "    gist = self.gists.create(description, public=public, files={filename: {\"content\": content}})\n",
     "    if not img_paths: return gist\n",
     "    with tempfile.TemporaryDirectory() as clone_dir:\n",
-    "        gist_id, gist_url = gist.id, gist.html_url\n",
     "        token = self.headers['Authorization'].split('token ')[1]\n",
-    "        repo = git.Repo.clone_from(f'https://{token}@gist.github.com/{gist_id}.git', clone_dir)\n",
+    "        _run_subp(['git', 'clone', f'https://{token}@gist.github.com/{gist.id}.git', clone_dir])\n",
     "        clone_dir, img_paths = Path(clone_dir), L(img_paths).map(Path)\n",
-    "        for o in img_paths: \n",
-    "            shutil.copy2(o, clone_dir/o.name)\n",
-    "            repo.index.add([o.name])\n",
-    "        repo.index.commit(\"Add images\")\n",
-    "        repo.remotes.origin.push()        \n",
-    "    updated_gist = self.gists.get(gist_id)\n",
+    "        for o in img_paths: shutil.copy2(o, clone_dir/o.name)\n",
+    "        _run_subp(['git', '-C', clone_dir, 'add', '.'])\n",
+    "        _run_subp(['git', '-C', clone_dir, 'commit', '-m', 'Add images'])\n",
+    "        _run_subp(['git', '-C', clone_dir, 'push'])    \n",
+    "    updated_gist = self.gists.get(gist.id)\n",
     "    img_urls = {o.name: updated_gist.files[o.name].raw_url for o in img_paths}\n",
-    "    content = replace_md_imgs(content, lambda m: f\"![{m['alt']}]({img_urls.get(m['url'], m['url'])})\")\n",
-    "    return self.gists.update(gist_id, files={filename:{'content':content}})"
+    "    content = img_md_pat.sub(lambda m: f\"![{m['alt']}]({img_urls.get(m['url'], m['url'])})\", content)\n",
+    "    return self.gists.update(gist.id, files={filename:{'content':content}})"
    ]
   },
   {
@@ -1088,7 +1089,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "https://gist.github.com/jph00/634c4553fac5fdd3b2d810dcdae2d841\n"
+      "https://gist.github.com/KeremTurgutlu/c2150e4efd1177439ff35a4633584144\n"
      ]
     }
    ],
@@ -1126,7 +1127,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "https://gist.github.com/jph00/dbd28d7ef14117b4aa4b0d8fc9a9aa81\n"
+      "https://gist.github.com/KeremTurgutlu/4c60f8b06baf7b57dc225dd86b65028f\n"
      ]
     }
    ],
@@ -1143,7 +1144,7 @@
     {
      "data": {
       "text/plain": [
-       "'some image\\n\\n![image](https://gist.githubusercontent.com/jph00/dbd28d7ef14117b4aa4b0d8fc9a9aa81/raw/c7f420c839f58c6ac0c05f1116317645d31d7e80/puppy.jpg)'"
+       "'some image\\n\\n![image](https://gist.githubusercontent.com/KeremTurgutlu/4c60f8b06baf7b57dc225dd86b65028f/raw/c7f420c839f58c6ac0c05f1116317645d31d7e80/puppy.jpg)'"
       ]
      },
      "execution_count": null,
@@ -1806,9 +1807,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "python3",
+   "display_name": "python",
    "language": "python",
-   "name": "python3"
+   "name": "python"
   }
  },
  "nbformat": 4,

ghapi/_modidx.py

@@ -86,10 +86,10 @@
                             'ghapi.core._mk_sig': ('core.html#_mk_sig', 'ghapi/core.py'),
                             'ghapi.core._mk_sig_detls': ('core.html#_mk_sig_detls', 'ghapi/core.py'),
                             'ghapi.core._preview_hdr': ('core.html#_preview_hdr', 'ghapi/core.py'),
+                            'ghapi.core._run_subp': ('core.html#_run_subp', 'ghapi/core.py'),
                             'ghapi.core.date2gh': ('core.html#date2gh', 'ghapi/core.py'),
                             'ghapi.core.gh2date': ('core.html#gh2date', 'ghapi/core.py'),
-                            'ghapi.core.print_summary': ('core.html#print_summary', 'ghapi/core.py'),
-                            'ghapi.core.replace_md_imgs': ('core.html#replace_md_imgs', 'ghapi/core.py')},
+                            'ghapi.core.print_summary': ('core.html#print_summary', 'ghapi/core.py')},
             'ghapi.event': { 'ghapi.event.GhApi.fetch_events': ('event.html#ghapi.fetch_events', 'ghapi/event.py'),
                              'ghapi.event.GhApi.list_events': ('event.html#ghapi.list_events', 'ghapi/event.py'),
                              'ghapi.event.GhApi.list_events_parallel': ('event.html#ghapi.list_events_parallel', 'ghapi/event.py'),

ghapi/core.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../00_core.ipynb.
 
 # %% auto 0
-__all__ = ['GH_HOST', 'img_md_pat', 'EMPTY_TREE_SHA', 'print_summary', 'GhApi', 'date2gh', 'gh2date', 'replace_md_imgs']
+__all__ = ['GH_HOST', 'img_md_pat', 'EMPTY_TREE_SHA', 'print_summary', 'GhApi', 'date2gh', 'gh2date']
 
 # %% ../00_core.ipynb 2
 from fastcore.all import *
@@ -17,7 +17,7 @@
 from datetime import datetime, timedelta, timezone
 from pprint import pprint
 from time import sleep
-import os, shutil, tempfile, git
+import os, shutil, tempfile, subprocess
 
 # %% ../00_core.ipynb 4
 GH_HOST = os.getenv('GH_HOST', "https://api.github.com")
@@ -164,27 +164,28 @@ def gh2date(dtstr:str)->datetime:
 
 # %% ../00_core.ipynb 69
 img_md_pat = re.compile(r'!\[(?P<alt>.*?)\]\((?P<url>[^\s]+)\)')
-def replace_md_imgs(content, func): return img_md_pat.sub(func, content)
+
+def _run_subp(cmd): 
+    r = subprocess.run(cmd, check=False, capture_output=True, text=True)
+    if r.returncode != 0: raise RuntimeError(r.stderr)
 
 @patch
 def create_gist(self:GhApi, description, content, filename='gist.txt', public=False, img_paths=None):
     'Create a gist, optionally with images where each md img url will be placed with img upload urls.'
     gist = self.gists.create(description, public=public, files={filename: {"content": content}})
     if not img_paths: return gist
     with tempfile.TemporaryDirectory() as clone_dir:
-        gist_id, gist_url = gist.id, gist.html_url
         token = self.headers['Authorization'].split('token ')[1]
-        repo = git.Repo.clone_from(f'https://{token}@gist.github.com/{gist_id}.git', clone_dir)
+        _run_subp(['git', 'clone', f'https://{token}@gist.github.com/{gist.id}.git', clone_dir])
         clone_dir, img_paths = Path(clone_dir), L(img_paths).map(Path)
-        for o in img_paths: 
-            shutil.copy2(o, clone_dir/o.name)
-            repo.index.add([o.name])
-        repo.index.commit("Add images")
-        repo.remotes.origin.push()        
-    updated_gist = self.gists.get(gist_id)
+        for o in img_paths: shutil.copy2(o, clone_dir/o.name)
+        _run_subp(['git', '-C', clone_dir, 'add', '.'])
+        _run_subp(['git', '-C', clone_dir, 'commit', '-m', 'Add images'])
+        _run_subp(['git', '-C', clone_dir, 'push'])    
+    updated_gist = self.gists.get(gist.id)
     img_urls = {o.name: updated_gist.files[o.name].raw_url for o in img_paths}
-    content = replace_md_imgs(content, lambda m: f"![{m['alt']}]({img_urls.get(m['url'], m['url'])})")
-    return self.gists.update(gist_id, files={filename:{'content':content}})
+    content = img_md_pat.sub(lambda m: f"![{m['alt']}]({img_urls.get(m['url'], m['url'])})", content)
+    return self.gists.update(gist.id, files={filename:{'content':content}})
 
 # %% ../00_core.ipynb 76
 @patch