Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.

Implement cli flag shorthand to include overrides from nixpkgs-python #138

Merged
merged 2 commits into from
Jul 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
- EXAMPLE=tornado
- EXAMPLE=connexion
- EXAMPLE=aiohttp
- EXAMPLE=flake8
# - EXAMPLE=vulnix
matrix:
exclude:
Expand Down
19 changes: 19 additions & 0 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -340,3 +340,22 @@ aiohttp-clear:
rm -f aiohttp.txt
rm -f aiohttp.nix
rm -f aiohttp_frozen.txt

flake8: flake8.nix
echo "building and testing flake8..."
$(NIX_BUILD) flake8.nix -o flake8 -A interpreter --show-trace --fallback
./flake8/bin/python -c 'import flake8'
$(NIX_SHELL) flake8.nix -A interpreter --run "python -c 'import flake8'"

flake8.nix: flake8.txt $(PYPI2NIX)
echo "generating flake8.nix expressions ..."
$(PYPI2NIX) -v --basename flake8 -r flake8.txt -I $(NIX_PATH) -V "3.5" --default-overrides

flake8.txt: flake8-clear
echo "flake8" > flake8.txt

flake8-clear:
rm -f flake8
rm -f flake8.txt
rm -f flake8.nix
rm -f flake8_frozen.txt
5 changes: 5 additions & 0 deletions examples/flake8_override.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ pkgs, python }:

self: super: {

}
15 changes: 14 additions & 1 deletion src/pypi2nix/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@
help=u'Extra expressions that override generated expressions ' +
u'for specific packages',
)
@click.option('--default-overrides/--no-default-overrides',
default=False,
help=u'Apply overrides from "nixpkgs-python" (https://github.com/garbas/nixpkgs-python)', # noqa
)
def main(version,
verbose,
nix_shell,
Expand All @@ -118,11 +122,20 @@ def main(version,
buildout,
editable,
setup_requires,
overrides
overrides,
default_overrides,
):
"""SPECIFICATION should be requirements.txt (output of pip freeze).
"""

if default_overrides:
overrides += tuple([
pypi2nix.overrides.OverridesGit(
repo_url='https://github.com/garbas/nixpkgs-python.git',
path='overrides.nix',
)
])

with open(os.path.join(os.path.dirname(__file__), 'VERSION')) as f:
pypi2nix_version = f.read()

Expand Down