[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
pull/1202/head
pre-commit-ci[bot] 2022-10-31 22:32:14 +00:00
rodzic 1926795c8c
commit 27c2b403db
63 zmienionych plików z 164 dodań i 175 usunięć

Wyświetl plik

@ -4,7 +4,6 @@
#
import datetime
# -- Project information -----------------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
#

Wyświetl plik

@ -1,14 +1,15 @@
import argparse
import sys
import os
import logging
import os
import sys
from . import __version__
from .app import Repo2Docker
from .engine import BuildError, ImageLoadError
from . import __version__
from .utils import (
validate_and_generate_port_mapping,
is_valid_docker_image_name,
R2dState,
is_valid_docker_image_name,
validate_and_generate_port_mapping,
)

Wyświetl plik

@ -7,24 +7,23 @@ Usage:
python -m repo2docker https://github.com/you/your-repo
"""
import getpass
import json
import sys
import logging
import os
import entrypoints
import getpass
import shutil
import sys
import tempfile
import time
from urllib.parse import urlparse
import entrypoints
import escapism
from pythonjsonlogger import jsonlogger
from traitlets import Any, Dict, Int, List, Unicode, Bool, default
from traitlets import Any, Bool, Dict, Int, List, Unicode, default
from traitlets.config import Application
from . import __version__
from . import __version__, contentproviders
from .buildpacks import (
CondaBuildPack,
DockerBuildPack,
@ -36,9 +35,8 @@ from .buildpacks import (
PythonBuildPack,
RBuildPack,
)
from . import contentproviders
from .engine import BuildError, ContainerEngineException, ImageLoadError
from .utils import ByteSpecification, chdir, R2dState
from .utils import ByteSpecification, R2dState, chdir
class Repo2Docker(Application):

Wyświetl plik

@ -1,10 +1,9 @@
from .base import BuildPack, BaseImage
from .python import PythonBuildPack
from .pipfile import PipfileBuildPack
from .base import BaseImage, BuildPack
from .conda import CondaBuildPack
from .julia import JuliaProjectTomlBuildPack
from .julia import JuliaRequireBuildPack
from .docker import DockerBuildPack
from .julia import JuliaProjectTomlBuildPack, JuliaRequireBuildPack
from .legacy import LegacyBinderDockerBuildPack
from .r import RBuildPack
from .nix import NixBuildPack
from .pipfile import PipfileBuildPack
from .python import PythonBuildPack
from .r import RBuildPack

Wyświetl plik

@ -1,14 +1,15 @@
import textwrap
import jinja2
import tarfile
import hashlib
import io
import logging
import os
import re
import logging
import string
import sys
import hashlib
import tarfile
import textwrap
import escapism
import jinja2
# Only use syntax features supported by Docker 17.09
TEMPLATE = r"""

Wyświetl plik

@ -5,9 +5,9 @@ from collections.abc import Mapping
from ruamel.yaml import YAML
from ..base import BaseImage
from .._r_base import rstudio_base_scripts
from ...utils import is_local_pip_requirement
from .._r_base import rstudio_base_scripts
from ..base import BaseImage
# pattern for parsing conda dependency line
PYTHON_REGEX = re.compile(r"python\s*=+\s*([\d\.]*)")

Wyświetl plik

@ -9,17 +9,16 @@ Usage:
python freeze.py [3.8]
"""
from argparse import ArgumentParser
from datetime import datetime
import os
import pathlib
import shutil
from subprocess import check_call
import sys
from argparse import ArgumentParser
from datetime import datetime
from subprocess import check_call
from ruamel.yaml import YAML
HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
ENV_FILE = HERE / "environment.yml"

Wyświetl plik

@ -1,7 +1,9 @@
"""Generates a variety of Dockerfiles based on an input matrix
"""
import os
import docker
from .base import BuildPack

Wyświetl plik

@ -6,8 +6,8 @@ import requests
import semver
import toml
from ..python import PythonBuildPack
from ...semver import find_semver_match
from ..python import PythonBuildPack
class JuliaProjectTomlBuildPack(PythonBuildPack):

Wyświetl plik

@ -2,8 +2,8 @@
import os
from ..python import PythonBuildPack
from ...semver import parse_version as V
from ..python import PythonBuildPack
class JuliaRequireBuildPack(PythonBuildPack):

Wyświetl plik

@ -1,7 +1,7 @@
"""BuildPack for nixpkgs environments"""
import os
from ..base import BuildPack, BaseImage
from ..base import BaseImage, BuildPack
class NixBuildPack(BaseImage):

Wyświetl plik

@ -1,8 +1,8 @@
"""Generates Dockerfiles based on an input matrix based on Python."""
import os
from ..conda import CondaBuildPack
from ...utils import is_local_pip_requirement, open_guess_encoding
from ..conda import CondaBuildPack
class PythonBuildPack(CondaBuildPack):

Wyświetl plik

@ -1,12 +1,12 @@
import re
import os
import datetime
import os
import re
import requests
from ..semver import parse_version as V
from .python import PythonBuildPack
from ._r_base import rstudio_base_scripts
from .python import PythonBuildPack
class RBuildPack(PythonBuildPack):

Wyświetl plik

@ -1,8 +1,8 @@
from .git import Git
from .base import Local
from .zenodo import Zenodo
from .figshare import Figshare
from .dataverse import Dataverse
from .figshare import Figshare
from .git import Git
from .hydroshare import Hydroshare
from .mercurial import Mercurial
from .swhid import Swhid
from .zenodo import Zenodo

Wyświetl plik

@ -1,11 +1,10 @@
import os
import json
import os
import shutil
from urllib.parse import parse_qs, urlparse, urlunparse
from urllib.parse import urlparse, urlunparse, parse_qs
from .doi import DoiProvider
from ..utils import copytree, deep_get
from .doi import DoiProvider
class Dataverse(DoiProvider):

Wyświetl plik

@ -1,18 +1,15 @@
import os
import json
import shutil
import logging
from os import makedirs
from os import path
from requests import Session, HTTPError
import os
import shutil
from os import makedirs, path
from zipfile import ZipFile, is_zipfile
from .base import ContentProvider
from ..utils import copytree, deep_get
from ..utils import normalize_doi, is_doi
from requests import HTTPError, Session
from .. import __version__
from ..utils import copytree, deep_get, is_doi, normalize_doi
from .base import ContentProvider
class DoiProvider(ContentProvider):

Wyświetl plik

@ -1,16 +1,14 @@
import json
import os
import re
import json
import shutil
from os import makedirs
from os import path
from urllib.request import Request
from os import makedirs, path
from urllib.error import HTTPError
from urllib.request import Request
from zipfile import is_zipfile
from .doi import DoiProvider
from ..utils import copytree, deep_get
from .doi import DoiProvider
class Figshare(DoiProvider):

Wyświetl plik

@ -1,7 +1,7 @@
import subprocess
from ..utils import R2dState, check_ref, execute_cmd
from .base import ContentProvider, ContentProviderException
from ..utils import execute_cmd, check_ref, R2dState
class Git(ContentProvider):

Wyświetl plik

@ -1,14 +1,13 @@
import zipfile
import json
import os
import shutil
import time
import json
from datetime import datetime, timezone, timedelta
import zipfile
from datetime import datetime, timedelta, timezone
from urllib.request import urlretrieve
from .doi import DoiProvider
from .base import ContentProviderException
from .doi import DoiProvider
class Hydroshare(DoiProvider):

Wyświetl plik

@ -1,7 +1,7 @@
import subprocess
from ..utils import R2dState, execute_cmd
from .base import ContentProvider, ContentProviderException
from ..utils import execute_cmd, R2dState
args_enabling_topic = ["--config", "extensions.topic="]

Wyświetl plik

@ -1,17 +1,16 @@
import io
import os
import re
import shutil
import tarfile
import time
import re
from os import path
import requests
from .base import ContentProvider
from ..utils import copytree
from .. import __version__
from ..utils import copytree
from .base import ContentProvider
def parse_swhid(swhid):

Wyświetl plik

@ -1,14 +1,12 @@
import os
import json
import os
import shutil
from os import makedirs
from os import path
from urllib.request import Request
from os import makedirs, path
from urllib.error import HTTPError
from urllib.request import Request
from .doi import DoiProvider
from ..utils import copytree, deep_get
from .doi import DoiProvider
class Zenodo(DoiProvider):

Wyświetl plik

@ -2,9 +2,10 @@
Docker container engine for repo2docker
"""
import docker
from traitlets import Dict
from iso8601 import parse_date
from traitlets import Dict
import docker
from .engine import Container, ContainerEngine, ContainerEngineException, Image

Wyświetl plik

@ -3,8 +3,8 @@ Interface for a repo2docker container engine
"""
from abc import ABC, abstractmethod
from traitlets.config import LoggingConfigurable
from traitlets.config import LoggingConfigurable
# Based on https://docker-py.readthedocs.io/en/4.2.0/containers.html

Wyświetl plik

@ -1,13 +1,12 @@
from contextlib import contextmanager
from enum import Enum
from functools import partial
import os
import re
import subprocess
from contextlib import contextmanager
from enum import Enum
from functools import partial
from shutil import copy2, copystat
import chardet
from shutil import copystat, copy2
from traitlets import Integer, TraitError

Wyświetl plik

@ -1,6 +1,8 @@
from distutils.cmd import Command
from setuptools import setup, find_packages
import sys
from distutils.cmd import Command
from setuptools import find_packages, setup
import versioneer
if sys.version_info[0] < 3:
@ -23,8 +25,8 @@ class GenerateDataverseInstallationsFileCommand(Command):
pass
def run(self):
from urllib.request import urlopen
import json
from urllib.request import urlopen
resp = urlopen(self.url, timeout=5)
resp_body = resp.read()

Wyświetl plik

@ -1,6 +1,6 @@
#!/usr/bin/env python
import sys
import os
import sys
from glob import glob
# conda should still be in /srv/conda

Wyświetl plik

@ -19,14 +19,13 @@ Test lifecycle:
import os
import pipes
import shlex
import requests
import subprocess
import time
from tempfile import TemporaryDirectory
import escapism
import pytest
import requests
import yaml
from repo2docker.__main__ import make_r2d

Wyświetl plik

@ -10,8 +10,8 @@ NOTE: This file has to be duplicated & present in all the following locations:
- tests/memlimit/dockerfile/postBuild
See https://github.com/jupyterhub/repo2docker/issues/160 for reason
"""
from ctypes import cdll, c_void_p, memset
import os
from ctypes import c_void_p, cdll, memset
libc = cdll.LoadLibrary("libc.so.6")
libc.malloc.restype = c_void_p

Wyświetl plik

@ -10,8 +10,8 @@ NOTE: This file has to be duplicated & present in all the following locations:
- tests/memlimit/dockerfile/postBuild
See https://github.com/jupyterhub/repo2docker/issues/160 for reason
"""
from ctypes import cdll, c_void_p, memset
import os
from ctypes import c_void_p, cdll, memset
libc = cdll.LoadLibrary("libc.so.6")
libc.malloc.restype = c_void_p

Wyświetl plik

@ -2,7 +2,6 @@
import os
import sys
# Verify - kernel's Python: use Python 2
print(sys.version_info)
assert sys.version_info[:2] == (2, 7)

Wyświetl plik

@ -1,4 +1,4 @@
from setuptools import setup, find_packages
from setuptools import find_packages, setup
setup(
name="Dummy",

Wyświetl plik

@ -1,6 +1,6 @@
#!/usr/bin/env python
import there
import dummy
# This package should be available, as it was a dependency for dummy
import pypi_pkg_test
import there

Wyświetl plik

@ -1,4 +1,4 @@
from setuptools import setup, find_packages
from setuptools import find_packages, setup
setup(
name="Dummy",

Wyświetl plik

@ -1,6 +1,6 @@
#!/usr/bin/env python
import there
import dummy
# This package should be available, as it was a dependency for dummy
import pypi_pkg_test
import there

Wyświetl plik

@ -1,4 +1,4 @@
from setuptools import setup, find_packages
from setuptools import find_packages, setup
setup(
name="Dummy",

Wyświetl plik

@ -1,16 +1,15 @@
import json
import os
import pytest
import re
from io import BytesIO
from tempfile import TemporaryDirectory
from unittest.mock import patch
from urllib.request import urlopen, Request
from urllib.request import Request, urlopen
import pytest
from repo2docker.contentproviders import Dataverse
test_dv = Dataverse()
harvard_dv = next(_ for _ in test_dv.hosts if _["name"] == "Harvard Dataverse")
cimmyt_dv = next(_ for _ in test_dv.hosts if _["name"] == "CIMMYT Research Data")

Wyświetl plik

@ -1,17 +1,17 @@
import json
import logging
import os
import re
import urllib
import pytest
import tempfile
import logging
from unittest.mock import patch, MagicMock, mock_open
import urllib
from unittest.mock import MagicMock, mock_open, patch
from zipfile import ZipFile
from repo2docker.contentproviders.doi import DoiProvider
from repo2docker.contentproviders.base import ContentProviderException
import pytest
from repo2docker import __version__
from repo2docker.contentproviders.base import ContentProviderException
from repo2docker.contentproviders.doi import DoiProvider
def test_content_id():

Wyświetl plik

@ -1,18 +1,17 @@
import json
import os
import re
import pytest
from contextlib import contextmanager
from io import BytesIO
from tempfile import TemporaryDirectory, NamedTemporaryFile
from tempfile import NamedTemporaryFile, TemporaryDirectory
from unittest.mock import patch
from urllib.request import urlopen, Request
from urllib.request import Request, urlopen
from zipfile import ZipFile
from repo2docker.contentproviders import Figshare
from repo2docker.__main__ import make_r2d
import pytest
from repo2docker.__main__ import make_r2d
from repo2docker.contentproviders import Figshare
test_content_ids = [
("https://figshare.com/articles/title/9782777", "9782777.v1"),

Wyświetl plik

@ -1,7 +1,9 @@
import os
import pytest
import subprocess
from tempfile import TemporaryDirectory
import pytest
from repo2docker.contentproviders import Git

Wyświetl plik

@ -1,16 +1,15 @@
import os
import pytest
import re
from contextlib import contextmanager
from tempfile import TemporaryDirectory, NamedTemporaryFile
from tempfile import NamedTemporaryFile, TemporaryDirectory
from unittest.mock import patch
from zipfile import ZipFile
import re
import pytest
from repo2docker.contentproviders import Hydroshare
from repo2docker.contentproviders.base import ContentProviderException
doi_responses = {
"https://doi.org/10.4211/hs.b8f6eae9d89241cf8b5904033460af61": (
"https://www.hydroshare.org/resource/b8f6eae9d89241cf8b5904033460af61"

Wyświetl plik

@ -1,5 +1,5 @@
import os
from tempfile import TemporaryDirectory, NamedTemporaryFile
from tempfile import NamedTemporaryFile, TemporaryDirectory
from repo2docker.contentproviders import Local

Wyświetl plik

@ -8,7 +8,6 @@ import pytest
from repo2docker.contentproviders import Mercurial
from repo2docker.contentproviders.mercurial import args_enabling_topic
SKIP_HG = os.environ.get("REPO2DOCKER_SKIP_HG_TESTS", "").lower() not in {
"",
"0",

Wyświetl plik

@ -1,22 +1,22 @@
import json
import os
import io
import tarfile
import shutil
import re
import urllib
import pytest
import tempfile
import json
import logging
import requests_mock
import os
import re
import shutil
import tarfile
import tempfile
import urllib
from os import makedirs
from os.path import join
from unittest.mock import patch, MagicMock, mock_open
from unittest.mock import MagicMock, mock_open, patch
from zipfile import ZipFile
from repo2docker.contentproviders.swhid import Swhid, parse_swhid
import pytest
import requests_mock
from repo2docker.contentproviders.base import ContentProviderException
from repo2docker.contentproviders.swhid import Swhid, parse_swhid
# this is a slightly stripped down copy of swh.model.cli.swhid_of_dir().

Wyświetl plik

@ -1,15 +1,15 @@
import json
import os
import pytest
import re
from contextlib import contextmanager
from io import BytesIO
from tempfile import TemporaryDirectory, NamedTemporaryFile
from tempfile import NamedTemporaryFile, TemporaryDirectory
from unittest.mock import patch
from urllib.request import urlopen, Request
from urllib.request import Request, urlopen
from zipfile import ZipFile
import pytest
from repo2docker.contentproviders import Zenodo
doi_responses = {

Wyświetl plik

@ -1,13 +1,13 @@
import errno
import pytest
from tempfile import TemporaryDirectory
from unittest.mock import patch
import docker
import escapism
import pytest
from repo2docker.app import Repo2Docker
import docker
from repo2docker.__main__ import make_r2d
from repo2docker.app import Repo2Docker
from repo2docker.utils import chdir

Wyświetl plik

@ -2,9 +2,11 @@
Test argument parsing and r2d construction
"""
import os
import pytest
from repo2docker.__main__ import make_r2d
from repo2docker import __version__
from repo2docker.__main__ import make_r2d
def test_version(capsys):

Wyświetl plik

@ -7,7 +7,6 @@ import subprocess
import pytest
here = os.path.dirname(os.path.abspath(__file__))
test_dir = os.path.dirname(here)
docker_simple = os.path.join(test_dir, "dockerfile", "simple")

Wyświetl plik

@ -1,7 +1,8 @@
from os.path import join as pjoin
from tempfile import TemporaryDirectory
import pytest
from tempfile import TemporaryDirectory
from repo2docker.buildpacks import LegacyBinderDockerBuildPack, PythonBuildPack
from repo2docker.utils import chdir

Wyświetl plik

@ -5,7 +5,6 @@ Test that --cache-from is passed in to docker API properly.
from unittest.mock import MagicMock
import docker
from repo2docker.buildpacks import (
BaseImage,
DockerBuildPack,

Wyświetl plik

@ -8,12 +8,10 @@ and that is the only thing that is tested.
"""
import os
import subprocess
from tempfile import TemporaryDirectory
from repo2docker.app import Repo2Docker
URL = "https://github.com/binderhub-ci-repos/repo2docker-ci-clone-depth"

Wyświetl plik

@ -1,10 +1,11 @@
"""
Test if the explict hostname is supplied correctly to the container
"""
import requests
import time
from repo2docker.app import Repo2Docker
import requests
from repo2docker.app import Repo2Docker
# Minimal Dockerfile to make build as fast as possible
DOCKER_FILE = """

Wyświetl plik

@ -5,7 +5,6 @@ import time
from repo2docker.__main__ import make_r2d
DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "dockerfile", "editable")

Wyświetl plik

@ -3,7 +3,9 @@ Test if the environment.yml is empty or it constains other data structure than a
"""
import os
import sys
import pytest
from repo2docker import buildpacks

Wyświetl plik

@ -1,5 +1,6 @@
"""Test if assemble scripts from outside of r2d repo are accepted."""
import time
from repo2docker.app import Repo2Docker
from repo2docker.buildpacks import PythonBuildPack

Wyświetl plik

@ -2,12 +2,11 @@ import os
from tempfile import TemporaryDirectory
from unittest.mock import patch
import pytest
from ruamel.yaml import YAML
from repo2docker.buildpacks.conda.freeze import set_python
import pytest
V = "3.7"
yaml = YAML(typ="rt")

Wyświetl plik

@ -1,12 +1,13 @@
"""
Test if labels are supplied correctly to the container
"""
from repo2docker.app import Repo2Docker
from repo2docker.buildpacks import BuildPack
from repo2docker import __version__
import pytest
from unittest.mock import Mock
import pytest
from repo2docker import __version__
from repo2docker.app import Repo2Docker
from repo2docker.buildpacks import BuildPack
URL = "https://github.com/binderhub-ci-repos/repo2docker-ci-clone-depth"

Wyświetl plik

@ -3,16 +3,13 @@ Test that build time memory limits are enforced
"""
import os
from unittest.mock import MagicMock
import docker
import pytest
import docker
from repo2docker.buildpacks import BaseImage, DockerBuildPack
basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

Wyświetl plik

@ -2,18 +2,18 @@
Test Port mappings work on running non-jupyter workflows
"""
import requests
import time
import os
import tempfile
import random
import tempfile
import time
from getpass import getuser
import docker
import pytest
import requests
from repo2docker.app import Repo2Docker
import docker
from repo2docker.__main__ import make_r2d
from repo2docker.app import Repo2Docker
def read_port_mapping_response(

Wyświetl plik

@ -1,8 +1,8 @@
from datetime import date
from unittest.mock import patch
import pytest
from requests.models import Response
from unittest.mock import patch
from repo2docker import buildpacks

Wyświetl plik

@ -1,5 +1,6 @@
import pytest
from semver import VersionInfo
from repo2docker import semver

Wyświetl plik

@ -4,8 +4,8 @@ Test if the subdirectory is correctly navigated to
import os
import escapism
import pytest
from repo2docker.app import Repo2Docker
TEST_REPO = "https://github.com/binderhub-ci-repos/repo2docker-subdir-support"

Wyświetl plik

@ -1,13 +1,15 @@
"""
Tests for repo2docker/utils.py
"""
import traitlets
import os
from repo2docker import utils
import pytest
import subprocess
import tempfile
import pytest
import traitlets
from repo2docker import utils
def test_capture_cmd_no_capture_success():
# This should succeed