drop carbon setup.py hack and use carbon 0.9.15 #428
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm not touching the 2.6 requirements.txt files here, and I'm thinking those should probably just be dropped from the 1.4 tree at this point to avoid clutter. |
|
Not doing 2.6 is tantamount to removing support for CentOS 6. I'm fine with that in principle as long as that's what we're claiming supportwise (we should be). |
|
I dunno what's up with travis; do we care? |
Prior to Carbon 0.9.11, Carbon's setup.py script would install files to /etc/init.d. To avoid this behavior, Calamari's Makefile used sed to rewrite setup.py and stop doing that. Newer versions of Carbon have dropped this mis-feature, so we can now rely on the stock version from PyPI without the hack. Drop the custom Makefile bits that rewrote carbon's setup.py script. Add carbon to the production requirements.txt. (0.9.15 is the latest upstream version at the time of this commit.) Thanks @dmick for helping with investigating this issue. This change has the side effect of giving us compatibility with Ubuntu Xenial's pip v8.1.1. Pip 8 has no longer supports the "--no-install" and "--no-download" arguments to "pip install".
ktdreyer
force-pushed
the
simplify-carbon
branch
from
44064d1
to
55fb7c6
Compare
|
I've rebased this to incorporate the latest .travis.yml change, and now it passes on Travis CI. |
|
Unfortunately this broke the RPM build (in mock) in a different way, and the fix is in #434 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prior to Carbon 0.9.11, Carbon's
setup.pyscript would install files to/etc/init.d. To avoid this behavior, Calamari'sMakefileusedsedto rewritesetup.pyand stop doing that.Newer versions of Carbon have dropped this mis-feature, so we can now rely on the stock version from PyPI without the hack.
Drop the custom
Makefilebits that rewrote carbon'ssetup.pyscript. Add carbon to the production requirements.txt. (0.9.15 is the latest upstream version at the time of this commit.)Thanks @dmick for helping with investigating this issue.
This change has the side effect of giving us compatibility with Ubuntu Xenial's pip v8.1.1. Pip 8 has no longer supports the
--no-installand--no-downloadarguments topip install.