Merge pull request #3786 from ostcar/requirements_again

support python 3.7

.travis.yml

@@ -1,11 +1,13 @@
 language: python
-sudo: false
+dist: xenial
+sudo: true
 cache:
   pip: true
   yarn: true
 python:
   - "3.5"
   - "3.6"
+  - "3.7"
 env:
   - TRAVIS_NODE_VERSION="10.5"
 before_install:

CHANGELOG.rst

@@ -17,6 +17,7 @@ Motions:
  - New table of contents with page numbers and categories in PDF [#3766].
  - Updated pdfMake to 0.1.37 [#3766].
  - Python 3.4 is not supported anymore [#3777].
+ - Support Python 3.7.
 
 
 Version 2.2 (2018-06-06)

openslides/core/migrations/0008_changed_logo_fields.py

@@ -42,6 +42,7 @@ def move_old_logo_settings(apps, schema_editor):
             logo_pdf_L = ConfigStore.objects.get(key=new_value_key)
         except ConfigStore.DoesNotExist:
             logo_pdf_L = ConfigStore(key=new_value_key)
+            logo_pdf_L.value = {}
 
         # Move the path to the new configentry
         logo_pdf_L.value['path'] = logo_pdf.value.get('path', '')

openslides/motions/projector.py

@@ -43,7 +43,7 @@ class MotionSlide(ProjectorElement):
         Keep the motion_syntax syncronized with the MotionStateAndRecommendationParser on the client.
         """
         # get the comments field for state and recommendation
-        motion_syntax = re.compile('\[motion:(\d+)\]')
+        motion_syntax = re.compile(r'\[motion:(\d+)\]')
         fields = config['motions_comments']
         state_field_id = None
         recommendation_field_id = None

requirements.txt

@@ -3,7 +3,9 @@
 
 # Requirements for development and tests in alphabetical order
 coverage
-flake8
+#flake8
+# Use master of flake8 until flake8 3.6 is released that supports python3.7
+git+https://gitlab.com/pycqa/flake8.git
 isort==4.2.5
 mypy
 fakeredis

requirements_production.txt

@@ -2,9 +2,9 @@
 bleach>=1.5.0,<2.2
 channels>=1.1,<1.2
 daphne<2
-Django>=1.10.4,<2.1
+Django>=1.10.4,<2.2
 djangorestframework>=3.4,<3.9
-jsonfield>=1.0,<2.1
+jsonfield2>=3.0,<3.1
 mypy_extensions>=0.3,<0.4
 PyPDF2>=1.26,<1.27
 roman>=2.0,<3.1

setup.py

@@ -34,7 +34,8 @@ setup(
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6', ],
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7', ],
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     install_requires=install_requires,