Explorar el Código

sigh vendor yet another dependency

Nick Sweeting hace 4 años
padre
commit
bd8a01e677
Se han modificado 6 ficheros con 7 adiciones y 3 borrados
  1. 3 0
      .gitmodules
  2. 1 1
      archivebox/system.py
  3. 1 0
      archivebox/vendor/atomicwrites.py
  4. 1 0
      archivebox/vendor/python-atomicwrites
  5. 0 1
      setup.py
  6. 1 1
      stdeb.cfg

+ 3 - 0
.gitmodules

@@ -23,3 +23,6 @@
 [submodule "archivebox/vendor/django-taggit"]
 	path = archivebox/vendor/django-taggit
 	url = https://github.com/jazzband/django-taggit
+[submodule "archivebox/vendor/python-atomicwrites"]
+	path = archivebox/vendor/python-atomicwrites
+	url = https://github.com/untitaker/python-atomicwrites

+ 1 - 1
archivebox/system.py

@@ -10,7 +10,7 @@ from typing import Optional, Union, Set, Tuple
 from subprocess import run as subprocess_run
 
 from crontab import CronTab
-from atomicwrites import atomic_write as lib_atomic_write
+from .vendor.atomicwrites import atomic_write as lib_atomic_write
 
 from .util import enforce_types, ExtendedEncoder
 from .config import OUTPUT_PERMISSIONS

+ 1 - 0
archivebox/vendor/atomicwrites.py

@@ -0,0 +1 @@
+python-atomicwrites/atomicwrites/__init__.py

+ 1 - 0
archivebox/vendor/python-atomicwrites

@@ -0,0 +1 @@
+Subproject commit c35cd32eb364d5a4210e64bf38fd1a55f329f316

+ 0 - 1
setup.py

@@ -36,7 +36,6 @@ INSTALL_REQUIRES = [
     # if there is no apt python3-package equivalent, then vendor it instead in
     # ./archivebox/vendor/
     "requests>=2.24.0",
-    "atomicwrites>=1.4.0",
     "mypy-extensions>=0.4.3",
     "django>=3.1.3",
     "django-extensions>=3.0.3",

+ 1 - 1
stdeb.cfg

@@ -5,6 +5,6 @@ Package3: archivebox
 Suite: focal
 Suite3: focal
 Build-Depends: dh-python, python3-pip, python3-setuptools, python3-wheel, python3-stdeb
-Depends3: nodejs, chromium-browser, wget, curl, git, ffmpeg, youtube-dl, python3-atomicwrites, python3-croniter, python3-crontab, python3-dateparser, python3-django, python3-django-extensions, python3-django-jsonfield, python3-mypy-extensions, python3-requests, python3-w3lib, ripgrep
+Depends3: nodejs, chromium-browser, wget, curl, git, ffmpeg, youtube-dl, python3-croniter, python3-crontab, python3-dateparser, python3-django, python3-django-extensions, python3-django-jsonfield, python3-mypy-extensions, python3-requests, python3-w3lib, ripgrep
 XS-Python-Version: >= 3.7
 Setup-Env-Vars: DEB_BUILD_OPTIONS=nocheck