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.

Sign up for GitHub

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

Requirements for downstream projects #39

Merged
merged 4 commits into from
Aug 15, 2016
Merged

Requirements for downstream projects #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab60995
Requirements in setup.py for downstream projects.
Aug 12, 2016
fc3e2c4
Merge branch 'next_release' into requirements-for-downstream-projects
Aug 12, 2016
ba7ad63
deprecate runtime-requirements.txt
Aug 12, 2016
e94ba24
Merge branch 'next_release' into requirements-for-downstream-projects
Aug 12, 2016
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
2 changes: 0 additions & 2 deletions Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ COPY rdrf/dev-requirements.txt /app/rdrf/
RUN NO_PROXY=${PIP_TRUSTED_HOST} pip install --upgrade -r rdrf/dev-requirements.txt
COPY rdrf/test-requirements.txt /app/rdrf/
RUN NO_PROXY=${PIP_TRUSTED_HOST} pip install --upgrade -r rdrf/test-requirements.txt
COPY rdrf/runtime-requirements.txt /app/rdrf/
RUN NO_PROXY=${PIP_TRUSTED_HOST} pip install --upgrade -r rdrf/runtime-requirements.txt

# Copy code and install the app
COPY . /app
Expand Down
2 changes: 0 additions & 2 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@ if [ "$1" = 'releasetarball' ]; then
git clone --depth=1 --branch=${GIT_TAG} ${PROJECT_SOURCE} .
git ls-remote ${PROJECT_SOURCE} ${GIT_TAG} > .version

# install python deps
# Note: Environment vars are used to control the behaviour of pip (use local devpi for instance)
pip install --upgrade -r rdrf/runtime-requirements.txt
pip install -e rdrf
set +x

Expand Down
3 changes: 0 additions & 3 deletions rdrf/requirements.txt
View file
Open in desktop

This file was deleted.

36 changes: 36 additions & 0 deletions rdrf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,41 @@
package_data = {}
start_dir = os.getcwd()

requirements=["ccg-django-utils==0.4.2",
"Django==1.8.14",
"django-ajax-selects",
"django-anymail==0.4.2",
"django-countries",
"django-extensions>=0.7.1",
"django-iprestrict==0.4.3",
"django-messages-ui==0.2.7",
"django-positions",
"django-registration-redux==1.3",
"djangorestframework==3.3.3",
"django-templatetag-handlebars==1.2.0",
"django-templatetag-sugar==1.0",
"django-useraudit==1.2.0",
"hgtools==6.5.1",
"openpyxl",
"polib==1.0.7",
"psycopg2==2.6.1",
"pycountry==1.20",
"pyinotify==0.9.6",
"pymongo==2.9.3",
"pyparsing==1.5.7",
"python-dateutil==2.5.3",
"python-gettext",
"python-memcached==1.58",
"pyyaml",
"setuptools_scm==1.10.1",
"six==1.10.0",
"sphinxcontrib-httpdomain==1.4.0",
"SQLAlchemy",
"uwsgi==2.0.13.1",
"uwsgitop",
"wsgiref==0.1.2",
]


def add_file_for_package(package, subdir, f):
full_path = os.path.join(subdir, f)
Expand Down Expand Up @@ -53,4 +88,5 @@ def add_file_for_package(package, subdir, f):
author_email='rdrf@ccg.murdoch.edu.au',
package_data=package_data,
zip_safe=False,
install_requires=requirements
)