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

Commit 39659a0

Browse files
committed
fixing tests
1 parent 004966c commit 39659a0

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

examples/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sentry: sentry.nix
2626

2727
sentry.nix: sentry.txt $(PYPI2NIX)
2828
@echo "generating sentry nix expressions ..."
29-
@$(PYPI2NIX) -r sentry.txt -E $(SENTRY_BUILD_INPUTS) -I $(NIX_PATH) -V "2.7"
29+
@$(PYPI2NIX) --basename sentry -r sentry.txt -E $(SENTRY_BUILD_INPUTS) -I $(NIX_PATH) -V "2.7"
3030

3131
sentry.txt: sentry-clear
3232
@echo "Sentry" > sentry.txt
@@ -46,7 +46,7 @@ empy: empy.nix
4646

4747
empy.nix: empy.txt $(PYPI2NIX)
4848
@echo "generating empy nix expressions ..."
49-
@$(PYPI2NIX) -r empy.txt -I $(NIX_PATH) -V "2.7"
49+
@$(PYPI2NIX) --basename empy -r empy.txt -I $(NIX_PATH) -V "2.7"
5050

5151
empy.txt: empy-clear
5252
@echo "empy" > empy.txt
@@ -68,7 +68,7 @@ lektor: lektor.nix
6868

6969
lektor.nix: lektor.txt $(PYPI2NIX)
7070
@echo "generating lektor nix expressions ..."
71-
@$(PYPI2NIX) -r lektor.txt -E $(LEKTOR_BUILD_INPUTS) -I $(NIX_PATH) -V "2.7"
71+
@$(PYPI2NIX) --basename lektop -r lektor.txt -E $(LEKTOR_BUILD_INPUTS) -I $(NIX_PATH) -V "2.7"
7272

7373
lektor.txt: lektor-clear
7474
@echo "Lektor" > lektor.txt
@@ -90,7 +90,7 @@ rss2email: rss2email.nix
9090

9191
rss2email.nix: rss2email.txt $(PYPI2NIX)
9292
@echo "generating rss2email nix expressions ..."
93-
@$(PYPI2NIX) -r rss2email.txt -V "3.4" -I $(NIX_PATH)
93+
@$(PYPI2NIX) --basename rss2email -r rss2email.txt -V "3.4" -I $(NIX_PATH)
9494

9595
rss2email.txt: rss2email-clear
9696
@echo "https://github.com/wking/rss2email/archive/master.zip#egg=rss2email" > rss2email.txt
@@ -114,7 +114,7 @@ awscli_and_requests: awscli_and_requests.nix
114114

115115
awscli_and_requests.nix: awscli_and_requests.txt $(PYPI2NIX)
116116
@echo "generating awscli and requests nix expressions ..."
117-
@$(PYPI2NIX) -r awscli.txt -r requests.txt -I $(NIX_PATH) -V "2.7"
117+
@$(PYPI2NIX) --basename awscli -r awscli.txt -r requests.txt -I $(NIX_PATH) -V "2.7"
118118

119119
awscli_and_requests.txt: awscli_and_requests-clear
120120
@echo "awscli" > awscli.txt

src/pypi2nix/cli.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
)
2424
@click.option('--basename',
2525
required=False,
26-
default=None,
26+
default='requirements',
2727
help=u'Basename which is used to generate files. By default '
2828
u'it uses basename of provided file.',
2929
)
@@ -104,10 +104,7 @@ def main(nix_path,
104104
requirements_files.append(editable_file)
105105

106106
project_dir = os.getcwd()
107-
if basename:
108-
requirements_name = basename
109-
else:
110-
requirements_name = os.path.join(project_dir, 'requirements')
107+
requirements_name = os.path.join(project_dir, basename)
111108

112109
if extra_build_inputs:
113110
extra_build_inputs = extra_build_inputs.split(' ')

0 commit comments

Comments
 (0)