Skip to content
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

pysolfc: 2.6.4 -> 2.8.0 #82183

Closed
wants to merge 3 commits into from
Closed

pysolfc: 2.6.4 -> 2.8.0 #82183

wants to merge 3 commits into from

Conversation

@bignaux
Copy link
Contributor

@bignaux bignaux commented Mar 9, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@kierdavis
Copy link
Contributor

@kierdavis kierdavis commented Mar 9, 2020

Thanks for doing this!

Any reason tkinter was removed as a dependency? It doesn't appear to be optional.

[kier@saelli:~/checkouts/nixpkgs]$ result/bin/pysol.py 
Traceback (most recent call last):
  File "/nix/store/ad0mvpbv4rjm9ygbazixphqvid6a2kps-PySolFC-2.8.0/bin/.pysol.py-wrapped", line 29, in <module>
    init()
  File "/nix/store/ad0mvpbv4rjm9ygbazixphqvid6a2kps-PySolFC-2.8.0/lib/python3.7/site-packages/pysollib/init.py", line 101, in init
    from six.moves import tkinter
  File "/nix/store/f2p4y8awg8px77wj2p8x5v8cv4sr7rgw-python3.7-six-1.14.0/lib/python3.7/site-packages/six.py", line 92, in __get__
    result = self._resolve()
  File "/nix/store/f2p4y8awg8px77wj2p8x5v8cv4sr7rgw-python3.7-six-1.14.0/lib/python3.7/site-packages/six.py", line 115, in _resolve
    return _import_module(self.mod)
  File "/nix/store/f2p4y8awg8px77wj2p8x5v8cv4sr7rgw-python3.7-six-1.14.0/lib/python3.7/site-packages/six.py", line 82, in _import_module
    __import__(name)
  File "/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/tkinter/__init__.py", line 36, in <module>
    import _tkinter # If this fails your Python may not be configured for Tk
ModuleNotFoundError: No module named '_tkinter'

@bignaux
Copy link
Contributor Author

@bignaux bignaux commented Mar 9, 2020

Yes i think it was bad reason BUT i've a doubt since i test and it works. So the issue here is that pysol.py should not be available, and it seems tkinter is propagated correctly if you use the pysol binary that i fix as default in the desktop file, so i donno yet if i've to bother the pysol.py issue.

@kierdavis
Copy link
Contributor

@kierdavis kierdavis commented Mar 9, 2020

If I try to launch the desktop file included in this package it fails because it can't find an executable named "pysol". This package only provides an executable named "pysol.py", so I can only assume that you have some other version of pysolfc also installed on your system that has the tkinter dependency correctly configured. What output does which pysol give on your computer?

@bignaux
Copy link
Contributor Author

@bignaux bignaux commented Mar 9, 2020

i don't want to tell you :3

Copy link
Contributor

@kierdavis kierdavis left a comment

Looks good to me now!

@bignaux
Copy link
Contributor Author

@bignaux bignaux commented Mar 9, 2020

if both maintainer are agree now, i can go on :)
Edit : but sure with adding 2 pythons modules, i dream that would be so easy :P

@ofborg ofborg bot requested a review from kierdavis Mar 9, 2020
Copy link
Contributor

@jonringer jonringer left a comment

this should also be 3 commits, 2 for adding the new modules, 1 for bumping the other.

https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md

pkgs/development/python-modules/pysol_cards/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pysol_cards/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pycotap/default.nix Outdated Show resolved Hide resolved
@Infinisil
Copy link
Member

@Infinisil Infinisil commented Mar 24, 2020

@jonringer Looking good now?

@@ -0,0 +1,25 @@
{ stdenv, fetchPypi, python }:
Copy link
Contributor

@jonringer jonringer Mar 24, 2020

since this is in python-modules, you should import the individual packages from the python package set, or else everything will be fixed to python2, and it create incoherence in some environments.

Suggested change
{ stdenv, fetchPypi, python }:
{ stdenv, fetchPypi, buildPythonPackage, pbr, random2, six }:

@@ -0,0 +1,25 @@
{ stdenv, fetchPypi, python }:

python.pkgs.buildPythonPackage rec {
Copy link
Contributor

@jonringer jonringer Mar 24, 2020

Suggested change
python.pkgs.buildPythonPackage rec {
buildPythonPackage rec {

sha256 = "0w0waj7r1kqlpic6g3pyg4208i393gc0zxb6n6k0vqhm6nivdcs5";
};

propagatedBuildInputs = with python.pkgs; [ pbr random2 six ];
Copy link
Contributor

@jonringer jonringer Mar 24, 2020

Suggested change
propagatedBuildInputs = with python.pkgs; [ pbr random2 six ];
propagatedBuildInputs = [ pbr random2 six ];

## Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
#checkInputs = with python.pkgs; [ pbr testtools stestr ];
doCheck = false;
Copy link
Contributor

@jonringer jonringer Mar 24, 2020

I believe stestr suites are also able to be ran with pytest.

Suggested change
## Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
#checkInputs = with python.pkgs; [ pbr testtools stestr ];
doCheck = false;
## Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
checkInputs = [ testtools pytest ];
doCheck = "pytest";

@stale
Copy link

@stale stale bot commented Sep 20, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 20, 2020

there's some conflicts @bignaux , did you still want to continue this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants