support python 3.7

fix new pep8 stype
This commit is contained in:
Oskar Hahn 2018-08-08 21:09:22 +02:00
parent bf3e000c5b
commit 92a39a3fc6
13 changed files with 36 additions and 29 deletions

View File

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

View File

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

View File

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

View File

@ -43,7 +43,7 @@ class MotionSlide(ProjectorElement):
Keep the motion_syntax syncronized with the MotionStateAndRecommendationParser on the client. Keep the motion_syntax syncronized with the MotionStateAndRecommendationParser on the client.
""" """
# get the comments field for state and recommendation # 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'] fields = config['motions_comments']
state_field_id = None state_field_id = None
recommendation_field_id = None recommendation_field_id = None

View File

@ -3,7 +3,9 @@
# Requirements for development and tests in alphabetical order # Requirements for development and tests in alphabetical order
coverage 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 isort==4.2.5
mypy mypy
fakeredis fakeredis

View File

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

View File

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