Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Install forked modules

Scott Peshak4970820c135b
diff --git a/.travis.yml b/.travis.yml
index 7872caa02..3d5a9d432 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ env:
install:
# Install requirements
- pip install -r requirements_devel.txt
+ - pip install -r requirements_forked.txt
- python setup.py develop
- npm install -g gulp gulp-cli
- npm install
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfile
index 74c8f2b1b..00a8028c5 100644
--- a/extras/docker/apache/Dockerfile
+++ b/extras/docker/apache/Dockerfile
@@ -56,6 +56,7 @@ RUN virtualenv --python python3 /home/wger/venv
RUN . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
&& pip install -r requirements.txt \
+ && pip install -r requirements_forked.txt \
&& python setup.py develop \
&& wger create_settings \
--settings-path /home/wger/src/settings.py \
diff --git a/requirements_forked.txt b/requirements_forked.txt
new file mode 100644
index 000000000..ba01c0a5e
--- /dev/null
+++ b/requirements_forked.txt
@@ -0,0 +1,13 @@
+#######################
+# Forked Modules
+# These modules have open PRs for compat changes
+#######################
+
+# django-sortedm2m
+-e git+git://github.com/peopledoc/django-sortedm2m.git@fix-compat-dj22#egg=django-sortedm2m
+
+# django-mobile
+-e git+git://github.com/visualspace/django-mobile.git@django111#egg=django-mobile
+
+# django-user_agents
+-e git+git://github.com/joehybird/django-user_agents.git@django_2.2#egg=django-user_agents
diff --git a/setup.py b/setup.py
index 205ba76a9..153050d89 100644
--- a/setup.py
+++ b/setup.py
@@ -23,12 +23,6 @@ with open('README.rst') as readme:
with open('requirements.txt') as requirements_production:
install_requires = requirements_production.readlines()
-install_requires = install_requires + [
- 'django-sortedm2m @ https://github.com/peopledoc/django-sortedm2m/tarball/fix-compat-dj22#egg=django-sortedm2m-1.5.1.dev1',
- 'django-mobile @ https://github.com/visualspace/django-mobile/tarball/django111#egg=django-mobile-0.7.0.dev1',
- 'django-user_agents @ https://github.com/joehybird/django-user_agents/tarball/django_2.2#egg=django-user_agents-0.3.1',
-]
-
setup(
name='wger',
description='FLOSS workout, fitness and weight manager/tracker written with Django',