Skip to content

Fix the output file for pip-compile with an explicit setup.py as source file - #731

Merged
atugushev merged 2 commits into
jazzband:masterfrom
atugushev:fix-output-file-for-setup-py
Feb 28, 2019
Merged

atugushev merged 2 commits into
jazzband:masterfrom
atugushev:fix-output-file-for-setup-py

Conversation

@atugushev

@atugushev atugushev commented Feb 8, 2019 •

Copy link
Copy Markdown
Member

The command pip-compile setup.py generates a setup.txt, but
it should be a requirements.txt file.

Fixes #730.

Changelog-friendly one-liner: Fix the output file for pip-compile with an explicit setup.py as source file

Contributor checklist
  • Provided the tests for the changes.
  • Requested a review from another contributor.
  • Gave a clear one-line description in the PR (that the maintainers can add to CHANGELOG.md on release).
  • Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

@codecov

codecov Bot commented Feb 8, 2019 •

Copy link
Copy Markdown

Codecov Report

Merging #731 into master will increase coverage by 0.23%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #731      +/-   ##
==========================================
+ Coverage   86.33%   86.56%   +0.23%     
==========================================
  Files          34       34              
  Lines        2129     2137       +8     
  Branches      303      302       -1     
==========================================
+ Hits         1838     1850      +12     
+ Misses        226      224       -2     
+ Partials       65       63       -2
Impacted Files Coverage Δ
tests/test_cli_compile.py 100% <100%> (ø) ⬆️
piptools/scripts/compile.py 90% <100%> (+3.07%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1545aa7...37ae661. Read the comment docs.

@atugushev
atugushev force-pushed the fix-output-file-for-setup-py branch from 23793fd to 6dd97c2 Compare February 8, 2019 18:18
@atugushev

Copy link
Copy Markdown
Member Author

Since a branch src_files[0] == '-' was touched i took responsibility to test that case.

Comment thread piptools/scripts/compile.py Outdated
@atugushev
atugushev force-pushed the fix-output-file-for-setup-py branch from 05a59ce to 4304584 Compare February 8, 2019 19:57
@atugushev atugushev added this to the 3.4.0 milestone Feb 8, 2019
@atugushev

Copy link
Copy Markdown
Member Author

Hello @blueyed. Gentle ping. Is everything okay in the PR. Could you approve or request any changes if you'd like.

@vphilippon vphilippon modified the milestones: 3.4.0, 3.5.0 Feb 19, 2019
@atugushev
atugushev force-pushed the fix-output-file-for-setup-py branch from 4304584 to 682b184 Compare February 28, 2019 01:34
@atugushev

Copy link
Copy Markdown
Member Author

I've resolved conflicts, rebased and squashed commits. I'll merge this as soon as tests are passed.

@blueyed, thanks for your help!

…ce file

The command `pip-compile setup.py` generates a `setup.txt`, but
it should be a requirements.txt file.
@atugushev
atugushev force-pushed the fix-output-file-for-setup-py branch from 682b184 to 37ae661 Compare February 28, 2019 08:31
@atugushev
atugushev merged commit 5af073e into jazzband:master Feb 28, 2019
atugushev added a commit to atugushev/pip-tools that referenced this pull request Feb 28, 2019
The `pip-compile setup.py --output-file=output.txt` ignores `--output-file` option and compiles to a `requirements.txt` file.
blueyed added a commit that referenced this pull request Feb 28, 2019
@atugushev

Copy link
Copy Markdown
Member Author

pip-tools v3.5.0 is released

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants