Skip to content

Commit 27c2b40

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 1926795 commit 27c2b40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+162
-173
lines changed

docs/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#
55
import datetime
66

7-
87
# -- Project information -----------------------------------------------------
98
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
109
#

repo2docker/__main__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import argparse
2-
import sys
3-
import os
42
import logging
3+
import os
4+
import sys
5+
6+
from . import __version__
57
from .app import Repo2Docker
68
from .engine import BuildError, ImageLoadError
7-
from . import __version__
89
from .utils import (
9-
validate_and_generate_port_mapping,
10-
is_valid_docker_image_name,
1110
R2dState,
11+
is_valid_docker_image_name,
12+
validate_and_generate_port_mapping,
1213
)
1314

1415

repo2docker/app.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@
77
88
python -m repo2docker https://github.com/you/your-repo
99
"""
10+
import getpass
1011
import json
11-
import sys
1212
import logging
1313
import os
14-
import entrypoints
15-
import getpass
1614
import shutil
15+
import sys
1716
import tempfile
1817
import time
1918
from urllib.parse import urlparse
2019

20+
import entrypoints
2121
import escapism
2222
from pythonjsonlogger import jsonlogger
23-
24-
from traitlets import Any, Dict, Int, List, Unicode, Bool, default
23+
from traitlets import Any, Bool, Dict, Int, List, Unicode, default
2524
from traitlets.config import Application
2625

27-
from . import __version__
26+
from . import __version__, contentproviders
2827
from .buildpacks import (
2928
CondaBuildPack,
3029
DockerBuildPack,
@@ -36,9 +35,8 @@
3635
PythonBuildPack,
3736
RBuildPack,
3837
)
39-
from . import contentproviders
4038
from .engine import BuildError, ContainerEngineException, ImageLoadError
41-
from .utils import ByteSpecification, chdir, R2dState
39+
from .utils import ByteSpecification, R2dState, chdir
4240

4341

4442
class Repo2Docker(Application):

repo2docker/buildpacks/__init__.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from .base import BuildPack, BaseImage
2-
from .python import PythonBuildPack
3-
from .pipfile import PipfileBuildPack
1+
from .base import BaseImage, BuildPack
42
from .conda import CondaBuildPack
5-
from .julia import JuliaProjectTomlBuildPack
6-
from .julia import JuliaRequireBuildPack
73
from .docker import DockerBuildPack
4+
from .julia import JuliaProjectTomlBuildPack, JuliaRequireBuildPack
85
from .legacy import LegacyBinderDockerBuildPack
9-
from .r import RBuildPack
106
from .nix import NixBuildPack
7+
from .pipfile import PipfileBuildPack
8+
from .python import PythonBuildPack
9+
from .r import RBuildPack

repo2docker/buildpacks/base.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import textwrap
2-
import jinja2
3-
import tarfile
1+
import hashlib
42
import io
3+
import logging
54
import os
65
import re
7-
import logging
86
import string
97
import sys
10-
import hashlib
8+
import tarfile
9+
import textwrap
10+
1111
import escapism
12+
import jinja2
1213

1314
# Only use syntax features supported by Docker 17.09
1415
TEMPLATE = r"""

repo2docker/buildpacks/conda/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
from ruamel.yaml import YAML
77

8-
from ..base import BaseImage
9-
from .._r_base import rstudio_base_scripts
108
from ...utils import is_local_pip_requirement
9+
from .._r_base import rstudio_base_scripts
10+
from ..base import BaseImage
1111

1212
# pattern for parsing conda dependency line
1313
PYTHON_REGEX = re.compile(r"python\s*=+\s*([\d\.]*)")

repo2docker/buildpacks/conda/freeze.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
python freeze.py [3.8]
1010
"""
1111

12-
from argparse import ArgumentParser
13-
from datetime import datetime
1412
import os
1513
import pathlib
1614
import shutil
17-
from subprocess import check_call
1815
import sys
16+
from argparse import ArgumentParser
17+
from datetime import datetime
18+
from subprocess import check_call
1919

2020
from ruamel.yaml import YAML
2121

22-
2322
HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
2423

2524
ENV_FILE = HERE / "environment.yml"

repo2docker/buildpacks/docker.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"""Generates a variety of Dockerfiles based on an input matrix
22
"""
33
import os
4+
45
import docker
6+
57
from .base import BuildPack
68

79

repo2docker/buildpacks/julia/julia_project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import semver
77
import toml
88

9-
from ..python import PythonBuildPack
109
from ...semver import find_semver_match
10+
from ..python import PythonBuildPack
1111

1212

1313
class JuliaProjectTomlBuildPack(PythonBuildPack):

repo2docker/buildpacks/julia/julia_require.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import os
44

5-
from ..python import PythonBuildPack
65
from ...semver import parse_version as V
6+
from ..python import PythonBuildPack
77

88

99
class JuliaRequireBuildPack(PythonBuildPack):

0 commit comments

Comments
 (0)