Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Optimizations/fixes for PyPI packaging

Roland07a72263f43a
diff --git a/.travis.yml b/.travis.yml
index b21328093..eeceff054 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ 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/README.rst b/README.rst
index c43127cec..d0978af63 100644
--- a/README.rst
+++ b/README.rst
@@ -61,8 +61,6 @@ Then install the python packages from pypi in the virtualenv::
$ git clone https://github.com/wger-project/wger.git
$ cd wger
$ pip install --upgrade pip
- $ pip install wheel
- $ pip install -r requirements_forked.txt
$ pip install -r requirements.txt # or requirements_devel.txt to develop
$ npm install
$ npm install bower
diff --git a/docs/development.rst b/docs/development.rst
index 0e573f5c7..3083eb9d5 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -37,7 +37,6 @@ Install Requirements
To install the Python requirements::
$ pip install -r requirements_devel.txt
- $ pip install -r requirements_forked.txt
$ npm install
$ npm install bower
$ python setup.py develop
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfile
index 8d0f325e9..71b451238 100644
--- a/extras/docker/apache/Dockerfile
+++ b/extras/docker/apache/Dockerfile
@@ -31,8 +31,7 @@ RUN apt-get update \
# Set up the application
COPY . .
RUN pip3 install wheel \
- && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_devel.txt \
- && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_forked.txt
+ && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_devel.txt
########
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 4ed7b436f..e13f2f11d 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -39,8 +39,7 @@ RUN apt-get update \
# Set up the application
COPY . .
RUN pip3 install wheel \
- && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_devel.txt \
- && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_forked.txt
+ && pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_devel.txt
########
@@ -69,7 +68,6 @@ WORKDIR /home/wger/src
RUN python3 -m venv /home/wger/venv
RUN . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
- && pip install wheel \
&& pip install --no-cache /wheels/* \
&& python setup.py develop \
&& npm install \
diff --git a/requirements.txt b/requirements.txt
index 894b48628..0648a78f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,10 @@
# Requirements for wger for production
#
+# Building/installing
+wheel
+
+# Application
bleach>=3.1,<3.2
django-bootstrap-breadcrumbs==0.9.1
django-bower==5.2.0
@@ -22,7 +26,6 @@ matplotlib>=3.1
requests
setuptools>=18.5
sphinx
-#psycopg2
# Not necessary for devel. Keeping them here for now till a nice solution is found
# AWS
@@ -46,3 +49,10 @@ docutils<0.16,>=0.10 # for botocore
six>=1.12.0 # for django-compressor
+#######################
+# Forked Modules
+# These modules have open PRs for compat changes
+#######################
+
+# django-user_agents
+-e git+git://github.com/joehybird/django-user_agents.git@django_2.2#egg=django-user_agents
diff --git a/requirements_forked.txt b/requirements_forked.txt
deleted file mode 100644
index 3d9c25374..000000000
--- a/requirements_forked.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#######################
-# Forked Modules
-# These modules have open PRs for compat changes
-#######################
-
-# 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 dce51f389..0794e0484 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,39 @@ setup(
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
- install_requires=install_requires,
+
+ # Copy-pasting here the requirement since the git+git:// syntax is not
+ # supported here. After the release, django-user-agent will be removed
+ # and this can be replaced again with: install_requires=install_requires,
+ install_requires=[
+ "wheel",
+ "bleach>=3.1,<3.2",
+ "django-bootstrap-breadcrumbs==0.9.1",
+ "django-bower==5.2.0",
+ "django-formtools>=2.0,<3.0",
+ "django-recaptcha==2.0.6",
+ "Django>=3.0,<3.1",
+ "django_compressor>=2.4,<2.5",
+ "django_extensions>=2.1",
+ "django-sortedm2m>=3.0,<3.1",
+ "django-storages>=1.7",
+ "easy-thumbnails>=2.7,<2.8",
+ "icalendar==4.0.3",
+ "invoke==0.17",
+ "pillow>=6.2,<6.3",
+ "python-mimeparse",
+ "reportlab==3.5.21",
+ "matplotlib>=3.1",
+ "requests",
+ "setuptools>=18.5",
+ "sphinx",
+
+ "django-cors-headers>=3.0",
+ "django-filter==2.1.0",
+ "django-tastypie>=0.14,<.0.15",
+ "djangorestframework>=3.11,<3.12",
+ "django-user_agents"
+ ],
entry_points={
'console_scripts': [
'wger = wger.__main__:main',
diff --git a/wger/tasks.py b/wger/tasks.py
index c24a3a30f..7cbf457de 100644
--- a/wger/tasks.py
+++ b/wger/tasks.py
@@ -117,7 +117,8 @@ def bootstrap(context,
create_or_reset_admin(context, settings_path=settings_path)
# Download JS libraries with bower
- call_command('bower', 'install')
+ context.run('npm install bower')
+ context.run('npm install')
# Start the webserver
if start_server: