Skip to content

Commit

Permalink
req: Hide min-requirements.txt
Browse files Browse the repository at this point in the history
Causes too much confusion.  We can get it via make if we need it for
testing.
  • Loading branch information
dwaynebailey committed Mar 7, 2014
1 parent 852f0d1 commit 51cfa60
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Pootle.egg-info/

# Requirements generation
.reqs
requirements-min-versions.txt
requirements/min-versions.txt
requirements-pinned.txt

# Coverage
Expand Down
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ help:

# Perform forced build using -W for the (.PHONY) requirements target
requirements:
$(MAKE) -W $(REQFILE) requirements-pinned.txt requirements-min-versions.txt
$(MAKE) -W $(REQFILE) requirements-pinned.txt requirements/min-versions.txt

REQS=.reqs
REQFILE=requirements/base.txt
Expand Down Expand Up @@ -123,13 +123,21 @@ requirements-pinned.txt: requirements-pinned.txt.in $(REQFILE)
sed -e 's/-\([0-9]\)/==\1/' -e 's/\.tar.*$$//') >> $@; \
esac;

requirements-min-versions.txt: requirements-min-versions.txt.in requirements/*.txt
requirements/min-versions.txt: requirements/*.txt
@if grep -q '>[0-9]' $^; then \
echo "Use '>=' not '>' for requirements"; exit 1; \
fi
@echo "creating $@"
@echo "# Automatically generated: DO NOT EDIT" > $@
@echo "# Regenerate using 'make requirements'" >> $@
@echo "# ====================================" >> $@
@echo "# Minimum Requirements" >> $@
@echo "# ====================================" >> $@
@echo "#" >> $@
@echo "# These are the minimum versions of dependencies that the Pootle developers" >> $@
@echo "# claim will work with Pootle." >> $@
@echo "#" >> $@
@echo "# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> $@
@echo "#" >> $@
@echo >> $@
@cat $< >> $@
@cat $^ | sed -n '/=/{s/>=/==/;s/,<.*//;p;}' >> $@
5 changes: 1 addition & 4 deletions docs/developers/releasing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,10 @@ Update the minimum version number for the requirements in:

Update the requirements files::

make requirements
make requirements-pinned.txt

.. note:: This creates the following files:

- requirements-min-versions.txt -- the minimum requirements we specified
at this time. Using that to deploy can ensure that you don't use a
newer version that breaks Pootle.
- requirements-pinned.txt - the maximum available version when we
released. Chances are we've tested with these and they are good.
Using this would prevent a person from intalling something newer but
Expand Down
9 changes: 0 additions & 9 deletions requirements-min-versions.txt.in

This file was deleted.

0 comments on commit 51cfa60

Please sign in to comment.