Merge pull request #3828 from ostcar/super_fastest_even_faster

Faster then fastes big_mode (with tests)

.travis.yml

@@ -15,7 +15,8 @@ before_install:
   - export PATH="$HOME/.yarn/bin:$PATH"
 install:
   - pip install --upgrade setuptools pip
-  - pip install --upgrade --requirement requirements.txt
+  - pip install --upgrade --requirement requirements/development.txt
+  - pip install --upgrade .[big_mode]
   - pip freeze
   - cd client && npm install && cd ..
 script:

Dockerfile

@@ -1,6 +1,7 @@
-FROM python:3.7
-RUN apt-get -y update && apt-get -y upgrade
-RUN apt-get install -y libpq-dev supervisor curl vim
+FROM python:3.7-slim
+RUN apt-get -y update && \
+  apt-get -y upgrade && \
+  apt-get install -y libpq-dev supervisor curl wget xz-utils bzip2 git gcc
 RUN useradd -m openslides
 
 ## BUILD JS STUFF
@@ -18,7 +19,7 @@ RUN node_modules/.bin/gulp --production
 
 # INSTALL PYTHON DEPENDENCIES
 USER root
-RUN pip install -r /app/requirements_big_mode.txt
+RUN pip install .[big_mode]
 
 ## Clean up
 RUN apt-get remove -y python3-pip wget curl

MANIFEST.in

@@ -2,8 +2,8 @@ include AUTHORS
 include CHANGELOG
 include LICENSE
 include README.rst
-include requirements_production.txt
-include requirements_big_mode.txt
+include requirements/production.txt
+include requirements/big_mode.txt
 include bower.json
 recursive-include openslides *.*
 exclude openslides/__pycache__/*

README.rst

@@ -72,7 +72,7 @@ compressed tar archive and run::
     $ pip install openslides-x.y.tar.gz
 
 This will install all required Python packages (see
-``requirements_production.txt``).
+``requirements/production.txt``).
 
 
 d. Start OpenSlides
@@ -163,7 +163,7 @@ Used software
 
 OpenSlides uses the following projects or parts of them:
 
-* Several Python packages (see ``requirements_production.txt``).
+* Several Python packages (see ``requirements/production.txt`` and ``requirements/big_mode.txt``).
 
 * Several JavaScript packages (see ``bower.json``)
 

requirements.txt

@@ -1,14 +1,6 @@
 # Requirements for OpenSlides in production
--r requirements_big_mode.txt
+-r requirements/production.txt
+-r requirements/big_mode.txt
 
 # Requirements for development and tests in alphabetical order
-coverage
-#flake8
-# Use master of flake8 until flake8 3.6 is released that supports python3.7
-git+https://gitlab.com/pycqa/flake8.git
-isort
-mypy
-pytest>=3.7.2
-pytest-django
-pytest-asyncio
-pytest-cov
+-r requirements/development.txt

requirements/big_mode.txt

@@ -1,6 +1,3 @@
-# Requirements for OpenSlides in production
--r requirements_production.txt
-
 # Requirements for Redis and PostgreSQL support
 channels-redis>=2.2,<2.3
 django-redis-sessions>=0.6.1,<0.7

requirements/development.txt

@@ -0,0 +1,10 @@
+coverage
+#flake8
+# Use master of flake8 until flake8 3.6 is released that supports python3.7
+git+https://gitlab.com/pycqa/flake8.git
+isort
+mypy
+pytest>=3.7.2
+pytest-django
+pytest-asyncio
+pytest-cov

setup.cfg

@@ -15,6 +15,8 @@ include_trailing_comma = true
 multi_line_output = 3
 lines_after_imports = 2
 combine_as_imports = true
+known_first_party = openslides
+known_third_party = pytest
 
 [mypy]
 ignore_missing_imports = true

setup.py

@@ -11,10 +11,10 @@ from openslides import __url__ as openslides_url
 with open('README.rst') as readme:
     long_description = readme.read()
 
-with open('requirements_production.txt') as requirements_production:
+with open('requirements/production.txt') as requirements_production:
     install_requires = requirements_production.readlines()
 
-with open('requirements_big_mode.txt') as requirements_big_mode:
+with open('requirements/big_mode.txt') as requirements_big_mode:
     extras_requires = requirements_big_mode.readlines()
 
 setup(