Unverified Commit 2082a325 authored by Cooper Lees's avatar Cooper Lees Committed by GitHub
Browse files

Refactor black into packages in src/ dir (#1376)

- Move black.py to src/black/__init__.py
- Have setuptools_scm make src/_black_version.py and exclude from git
- Move blackd.py to src/blackd/__init__.py
- Move blib2to3/ to src/
- Update `setup.py`
- Update unittests to pass
  - Mostly path fixing + resolving
- Update CI
  - pre-commit config
  - appveyor + travis

Tested on my mac with python 3.7.5 via:
```
python3 -m venv /tmp/tb3
/tmp/tb3/bin/pip install --upgrade setuptools pip coverage pre-commit
/tmp/tb2/bin/pip install ~/repos/black/
cd ~/repos/black/
/tmp/tb2/bin/coverage run tests/test_black.py
/tmp/tb3/bin/pre-commit run -a
/tmp/tb3/bin/black --help
/tmp/tb3/bin/black ~/repos/ptr/ptr.py
```
parent 0721f117
Loading
Loading
Loading
Loading
+2 −2
Changes for .appveyor.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ build: off

test_script:
  - C:\Python36\python.exe tests/test_black.py
  - C:\Python36\python.exe -m mypy black.py blackd.py tests/test_black.py blib2to3
  - C:\Python36\python.exe -m mypy src/black src/blackd tests/test_black.py src/blib2to3

after_test:
  - C:\Python36\python.exe -m pip install pyinstaller
  - "%CMD_IN_ENV% C:\\Python36\\python.exe -m PyInstaller --clean -F --add-data
    blib2to3/;blib2to3 black.py"
    src/blib2to3/;blib2to3 src/black/__init__.py"

artifacts:
  - path: dist/black.exe
+1 −1
Changes for .coveragerc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
[report]
omit =
  blib2to3/*
  src/blib2to3/*
  tests/data/*
  */site-packages/*
+1 −1
Changes for .gitignore: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ black.egg-info
build/
dist/
pip-wheel-metadata/
_black_version.py
src/_black_version.py
.idea
.eggs
.dmypy.json
+1 −1
Changes for .pre-commit-config.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
# Note: don't use this config for your own repositories. Instead, see
# "Version control integration" in README.md.
exclude: ^(blib2to3/|profiling/|tests/data/)
exclude: ^(src/blib2to3/|profiling/|tests/data/)
repos:
  - repo: local
    hooks:
+1 −1
Changes for .travis.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ matrix:
    - python: 3.9-dev
before_deploy:
  - pip install pyinstaller
  - pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py
  - pyinstaller --clean -F --add-data src/blib2to3/:blib2to3 src/black/__init__.py
deploy:
  provider: releases
  api_key:
Loading