New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
pythonPackages.sqlalchemy: 1.3.23 -> 1.4.7 #119232
Conversation
6bbc378
to
c1e4896
Compare
/rebase staging |
version = "1.3.23"; | ||
version = "1.4.7"; | ||
|
||
disabled = !(isPy27 || pythonAtLeast "3.6"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
disabled = !(isPy27 || pythonAtLeast "3.6"); | |
disabled = pythonOlder "3.6"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
python-2.7 is still supported by sqlalchemy-1.4. Only versions before 3.6 in the 3 series are not (i.e between 2.7 excluded to 3.5 included).
Considering we do not ship any python3 release before 3.6 in nixpkgs, it looks like this all line could be dropped altogether. I admit having the requirement explicitly stated are good, and do not mind if they are kept.
@@ -30,14 +25,16 @@ buildPythonPackage rec { | |||
|
|||
pytestFlagsArray = [ "-n auto" ]; | |||
|
|||
buildInputs = lib.optional isPy3k greenlet; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't greenlet required at runtime?
postInstall = '' | ||
sed -e 's:--max-worker-restart=5::g' -i setup.cfg | ||
''; | ||
|
||
dontUseSetuptoolsCheck = true; | ||
|
||
# disable mem-usage tests on mac, has trouble serializing pickle files | ||
disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] | ||
disabledTests = lib.optionals isPy3k [ "exception_persistent_flush_py3k "] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
disabledTests = lib.optionals isPy3k [ "exception_persistent_flush_py3k "] | |
disabledTests = [ "exception_persistent_flush_py3k "] |
c1e4896
to
160cce4
Compare
Rebased, please reopen the pull request to restart CI |
@vanzef can you resolve the merge conflict? |
160cce4
to
64a4253
Compare
@sternenseemann I did as you suggested, but didn't get any conflicts and it seems that everything is back to mess. P.S. Is there a way to fix all this without pinging everyone each time? |
94588b4
to
ee02205
Compare
ee02205
to
dece21f
Compare
dece21f
to
b56b10f
Compare
I've went ahead and did that for you. Apologies, I forgot to mention that you need to do an interactive rebase and drop every commit except the one you are trying to get merged (not sure if there is a more convenient way for doing this). |
@@ -30,14 +27,17 @@ buildPythonPackage rec { | |||
|
|||
pytestFlagsArray = [ "-n auto" ]; | |||
|
|||
propagatedBuildInputs = lib.optional isPy3k greenlet |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
propagatedBuildInputs = lib.optional isPy3k greenlet | |
propagatedBuildInputs = [ greenlet ] |
Only py3.X
is supported (by disable), so the optional is not needed.
Using the rebase action I used and you reverted :) |
superseded by #121854 |
Motivation for this change
Update since 1.3.* is in maintenance mode
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)