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.

Sign up for GitHub

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

Jump to bottom

pythonPackages.elasticsearch-curator: fix on staging #41603

Merged
merged 1 commit into from Jun 11, 2018
Merged

pythonPackages.elasticsearch-curator: fix on staging #41603

merged 1 commit into from Jun 11, 2018

Conversation

danbst
Copy link
Contributor

@danbst danbst commented Jun 6, 2018

Motivation for this change

Fix build of elasticsearch-curator.
cc @basvandijk

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@danbst danbst requested a review from FRidh as a code owner June 6, 2018 20:34
@danbst danbst changed the title Curator 552 elasticsearch-curator: 5.5.1 -> 5.5.2 Jun 6, 2018
@danbst
Copy link
Contributor Author

danbst commented Jun 7, 2018

As for certifi, the only change was certifi/python-certifi@bf1224e (removed Elektronik Sertifika Hizmet from trusted). I'm suprised it causes so much rebuilds, according to ofborg, but I assume most of those are Python-only?

dotlambda
dotlambda reviewed Jun 7, 2018
View reviewed changes
pkgs/development/python-modules/certifi/default.nix Outdated
@@ -5,12 +5,12 @@

buildPythonPackage rec {
pname = "certifi";
version = "2018.1.18";
version = "2018.4.16";
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line. name is set automatically.

@dotlambda dotlambda changed the title elasticsearch-curator: 5.5.1 -> 5.5.2 pythonPackages.elasticsearch-curator: 5.5.1 -> 5.5.2 Jun 7, 2018
@dotlambda
Copy link
Member

@danbst Please squash the last commit into the appropriate one and format your commit messages according to the contributing guidelines, i.e. as the title of this PR.

@GrahamcOfBorg build python2.pkgs.certifi python3.pkgs.certifi python2.pkgs.elasticsearch-curator python3.pkgs.elasticsearch-curator

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.certifi, python3.pkgs.certifi, python2.pkgs.elasticsearch-curator, python3.pkgs.elasticsearch-curator

Partial log (click to expand)

TOTAL                                  3086   1093    65%
----------------------------------------------------------------------
Ran 508 tests in 234.783s

OK (SKIP=1)
Shutting down....
/nix/store/ixpkgqg4pqgwg20mjp3g68jp0j5g8bfb-python2.7-certifi-2018.4.16
/nix/store/3imni9l57hfsv202w2dg5lb6r2llq3jk-python3.6-certifi-2018.4.16
/nix/store/7zid2zq68bhvbm0hiiqasdi80r26bypp-python2.7-elasticsearch-curator-5.5.2
/nix/store/my686p9wa8sawijxrsj85almrjhs93jx-python3.6-elasticsearch-curator-5.5.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.certifi, python3.pkgs.certifi, python2.pkgs.elasticsearch-curator, python3.pkgs.elasticsearch-curator

Partial log (click to expand)

curator/validators/config_file.py         4      4     0%
curator/validators/filters.py            32     10    69%
curator/validators/options.py            13     13     0%
curator/validators/schemacheck.py        41      8    80%
---------------------------------------------------------
TOTAL                                  3086   1095    65%
----------------------------------------------------------------------
Ran 508 tests in 150.806s

OK (SKIP=1)

@FRidh
Copy link
Member

FRidh commented Jun 10, 2018

Also rebase to staging.

@dotlambda
Copy link
Member

Staging already has elasticsearch-curator: 5.5.4. We should include the certifi bump in the next package set update however.

@danbst
Copy link
Contributor Author

danbst commented Jun 11, 2018

Oh, indeed! And it fails to build exactly because certifi is not bumped
https://hydra.nixos.org/build/75612592/nixlog/1/tail

unpacking sources
unpacking source archive /nix/store/83lvqn2nn8n5il6k8h6jm4d4kh9a9r45-elasticsearch-curator-5.5.4.tar.gz
source root is elasticsearch-curator-5.5.4
setting SOURCE_DATE_EPOCH to timestamp 1527091381 of file elasticsearch-curator-5.5.4/setup.cfg
patching sources
configuring
building
Download error on https://pypi.org/simple/certifi/: [Errno -2] Name or service not known -- Some packages may not be found!
Download error on https://pypi.org/simple/: [Errno -2] Name or service not known -- Some packages may not be found!
No local packages or working download links found for certifi>=2018.4.16
Traceback (most recent call last):
  File "nix_run_setup", line 8, in <module>
    exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
  File "setup.py", line 173, in <module>
    tests_require = ["mock", "nose", "coverage", "nosexcover"]
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/setuptools/__init__.py", line 128, in setup
    _install_setup_requires(attrs)
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/setuptools/__init__.py", line 123, in _install_setup_requires
    dist.fetch_build_eggs(dist.setup_requires)
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/setuptools/dist.py", line 514, in fetch_build_eggs
    replace_conflicting=True,
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/pkg_resources/__init__.py", line 770, in resolve
    replace_conflicting=replace_conflicting
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/pkg_resources/__init__.py", line 1053, in best_match
    return self.obtain(req, installer)
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/pkg_resources/__init__.py", line 1065, in obtain
    return installer(requirement)
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/setuptools/dist.py", line 581, in fetch_build_egg
    return cmd.easy_install(req)
  File "/nix/store/x9yd5nwcqndjmqzpysfhl426wwpzbqz9-python2.7-bootstrapped-pip-10.0.1/lib/python2.7/site-packages/setuptools/command/easy_install.py", line 667, in easy_install
    raise DistutilsError(msg)
distutils.errors.DistutilsError: Could not find suitable distribution for Requirement.parse('certifi>=2018.4.16')
builder for '/nix/store/a3hqi1dfjwnrwi3mpyiyklvvihqaxicg-python2.7-elasticsearch-curator-5.5.4.drv' failed with exit code 1

@danbst danbst changed the base branch from master to staging June 11, 2018 14:47
@danbst
Copy link
Contributor Author

danbst commented Jun 11, 2018 •
edited

rebased over staging which dropped curator update - staging has newer one

@danbst danbst changed the title pythonPackages.elasticsearch-curator: 5.5.1 -> 5.5.2 pythonPackages.elasticsearch-curator: fix on staging Jun 11, 2018
@dotlambda
Copy link
Member

Please get rid of the superfluous commits.

@danbst
Copy link
Contributor Author

danbst commented Jun 11, 2018

Also, @FRidh is that a direct requirement to have base16 encoded sha256 hash?

@dotlambda
Copy link
Member

You can take the base16 one from PyPI or leave it as is, it doesn't matter very much. However, the hash from PyPI makes it a bit easier to confirm that the right archive is used.

@danbst
Copy link
Contributor Author

danbst commented Jun 11, 2018

@dotlambda done!

@dotlambda
Copy link
Member

Commit message still not formatted correctly :(

@dotlambda dotlambda merged commit 694684f into NixOS:staging Jun 11, 2018
@danbst
Copy link
Contributor Author

danbst commented Jun 11, 2018

@dotlambda aye, sorry, forgot the colon. Do we have automated tools to process/aggregate commit messages?

@danbst danbst deleted the curator-552 branch June 11, 2018 15:13
@dotlambda
Copy link
Member

Only @GrahamcOfBorg which processes commit messages to run the appropriate builds.

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

@dotlambda dotlambda dotlambda left review comments

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@danbst @dotlambda @GrahamcOfBorg @FRidh