Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethreitz committed Mar 14, 2018
1 parent eb342c8 commit c2f7f69
Show file tree
Hide file tree
Showing 13 changed files with 852 additions and 469 deletions.
6 changes: 3 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[dev-packages]

"pipenv" = {path = ".", editable = true}
pipenv = {path = ".", editable = true}
"flake8" = ">=3.3.0,<4"
pytest = "*"
mock = "*"
Expand All @@ -9,10 +9,10 @@ twine = "*"
sphinx-click = "*"
pytest-xdist = "*"
click = "*"
"pytest-pypy" = {path = "./tests/pytest-pypi", editable = true}
pytest-pypy = {path = "./tests/pytest-pypi", editable = true}
pytest-tap = "*"
stdeb = {version="*", sys_platform="== 'linux'"}

black = {git = "https://github.com/ambv/black.git", python_version = "=='3.6'"}

[packages]

Expand Down
55 changes: 18 additions & 37 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions pipenv/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,24 @@
# |__/||~~\|--|/~\\ /
# | ||__/|__| |\/
# |

import os
import sys


PIPENV_ROOT = os.path.dirname(os.path.realpath(__file__))
PIPENV_VENDOR = os.sep.join([PIPENV_ROOT, 'vendor'])
PIPENV_PATCHED = os.sep.join([PIPENV_ROOT, 'patched'])
# Inject vendored directory into system path.
sys.path.insert(0, PIPENV_VENDOR)

# Inject patched directory into system path.
sys.path.insert(0, PIPENV_PATCHED)

# Hack to make things work better.
try:
if 'concurrency' in sys.modules:
del sys.modules['concurrency']
except Exception:
pass

from .cli import cli
from . import resolver
from .import resolver

if __name__ == '__main__':
cli()
2 changes: 0 additions & 2 deletions pipenv/__version__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

# ___ ( ) ___ ___ __
# // ) ) / / // ) ) //___) ) // ) ) || / /
# //___/ / / / //___/ / // // / / || / /
# // / / // ((____ // / / ||/ /

__version__ = '11.7.4'
Loading

0 comments on commit c2f7f69

Please sign in to comment.