Skip to content

Commit

Permalink
Bug 1070470 - Rename compiled.txt to common.txt
Browse files Browse the repository at this point in the history
The packages in this file are already a mixture of pure and compiled
packages. It's not worth moving the pure packages to checked-in.txt,
since we'll eventually be removing checked-in.txt and the associated
vendor/ and moving everything in there to this file. As such, common.txt
more accurately reflects the purpose of this file.
  • Loading branch information
Ed Morley committed Mar 12, 2015
1 parent f4e1361 commit 71ed4c3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .landscape.yaml
Expand Up @@ -9,7 +9,7 @@ uses:
- django
- celery
requirements:
- requirements/compiled.txt
- requirements/common.txt
- requirements/dev.txt
ignore-paths:
- vendor
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -27,7 +27,7 @@ services:
- rabbitmq
- memcached
install:
- pip install -r requirements/compiled.txt
- pip install -r requirements/common.txt
- pip install -r requirements/dev.txt
before_script:
- python setup.py build_ext --inplace
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -4,7 +4,7 @@ RUN virtualenv /venv
ENV PATH /venv/bin:$PATH
WORKDIR /app
RUN apt-get update && apt-get install -yq --force-yes mysql-client
COPY ./requirements/compiled.txt /app/requirements.txt
COPY ./requirements/common.txt /app/requirements.txt
RUN pip install -r requirements.txt

COPY ./docker/etc/profile.d/treeherder.sh /etc/profile.d/treeherder.sh
Expand Down
2 changes: 1 addition & 1 deletion puppet/manifests/classes/python.pp
Expand Up @@ -55,7 +55,7 @@
],
user => "${APP_USER}",
cwd => '/tmp',
command => "${VENV_DIR}/bin/pip install --download-cache=/home/${APP_USER}/pip_cache -r ${PROJ_DIR}/requirements/compiled.txt",
command => "${VENV_DIR}/bin/pip install --download-cache=/home/${APP_USER}/pip_cache -r ${PROJ_DIR}/requirements/common.txt",
timeout => 1800,
}

Expand Down
1 change: 1 addition & 0 deletions requirements/compiled.txt → requirements/common.txt
@@ -1,4 +1,5 @@
# Dependencies that are pip installed and not checked in
# and are shared between deployment and dev environments
gunicorn==17.5
Django==1.7.4
celery==3.1.16
Expand Down

0 comments on commit 71ed4c3

Please sign in to comment.