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

Cleanup release.nix and setup.py; bump to 19.09 in CI #18

Merged
merged 1 commit into from Nov 22, 2019

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Nov 21, 2019

  • Use pname
  • Consistent formatting and indentation
  • Better meta description
  • Use substituteAllInPlace
  • Cleanup setup.py
  • Use 19.09 channel in Travis CI

No real functional change.

- Use pname
- Consistent formatting and indentation
- Better meta description
- Use substituteAllInPlace
- Cleanup setup.py
- Use 19.09 channel in Travis CI

No real functional change.
@bhipple
Copy link
Contributor Author

bhipple commented Nov 21, 2019

Actually, I don't see any Travis builds on any PRs; is there actually CI for this repo?

for i in setup.py; do
substituteInPlace $i --subst-var-by version ${version}
done
substituteAllInPlace setup.py
Copy link
Member

Choose a reason for hiding this comment

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

this lacks --subst-var-by version ${version} right ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

substituteAllInPlace replaces every instance of @foo@ with the value of $foo, if set. Since version is set this does the same thing in less code. If in doubt we can add a cat setup.py at the end of our patch phase to verify:

λ brh nixops-aws →  nix-build release.nix -A build.x86_64-linux
these derivations will be built:
  /nix/store/ajy200czzl0f8wbsqzb1j14fcl9dmlaq-nixops-aws-1.7pre0_abcdef.drv
building '/nix/store/ajy200czzl0f8wbsqzb1j14fcl9dmlaq-nixops-aws-1.7pre0_abcdef.drv'...
...
patching sources
from distutils.core import setup


setup(name='nixops-aws',
      version='1.7pre0_abcdef',
      description='NixOS cloud deployment tool, but for aws',
      url='https://github.com/NixOS/nixops-aws',
      # TODO: add author
      author='',
      author_email='',
      packages=['nixopsaws', 'nixopsaws.data', 'nixopsaws.resources', 'nixopsaws.backends'],
      entry_points={'nixops': ['aws = nixopsaws.plugin']},
      py_modules=['plugin']
)
configuring
no configure script, doing nothing
building
...

Copy link
Member

Choose a reason for hiding this comment

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

great, I didn't know that. Thanks

@AmineChikhaoui
Copy link
Member

Actually, I don't see any Travis builds on any PRs; is there actually CI for this repo?

Yeah I don't think we did the Travis setup for the individual plugin repos

@bhipple
Copy link
Contributor Author

bhipple commented Nov 22, 2019

It's an orthogonal change to this PR, but it might be nice to turn Travis CI (or some other equivalent CI setup) on PRs to validate the basics, at least.

@AmineChikhaoui AmineChikhaoui merged commit 4526749 into NixOS:master Nov 22, 2019
@bhipple bhipple deleted the feature/cleanup-release.nix branch December 16, 2019 01:43
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.

None yet

2 participants