From 5618c04416719c30572491394d3e8a176be58a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Wed, 15 Jul 2020 16:13:24 +0200 Subject: [PATCH 1/3] Use twisted[tls] in production.txt to install required packages. --- requirements/production.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/production.txt b/requirements/production.txt index 3386cc971..8739d7432 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -21,4 +21,4 @@ roman>=2.0,<3.2 setuptools>=29.0,<42.0 typing_extensions>=3.6.6,<3.8 websockets>=8.0,<9.0 -twisted>=20.3.0 +twisted[tls]>=20.3.0 diff --git a/setup.py b/setup.py index 06a20988b..e46c11b35 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ setup( classifiers=[ # http://pypi.python.org/pypi?%3Aaction=list_classifiers # 'Development Status :: 3 - Alpha', - "Development Status :: 4 - Beta", - # 'Development Status :: 5 - Production/Stable', + # "Development Status :: 4 - Beta", + 'Development Status :: 5 - Production/Stable', "Environment :: Web Environment", "Framework :: Django", "License :: OSI Approved :: MIT License", From 9aefb122e691f4e631cff2d4d3599f30cff61745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Wed, 15 Jul 2020 16:16:00 +0200 Subject: [PATCH 2/3] Release 3.2 --- client/package.json | 2 +- openslides/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index fe095b543..0a1cfe43b 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "OpenSlides3-Client", - "version": "3.1.1", + "version": "3.2.0", "repository": { "type": "git", "url": "git://github.com/OpenSlides/OpenSlides.git" diff --git a/openslides/__init__.py b/openslides/__init__.py index 25527011f..d46176093 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,6 +1,6 @@ __author__ = "OpenSlides Team " __description__ = "Presentation and assembly system" -__version__ = "3.2-master" +__version__ = "3.2" __license__ = "MIT" __url__ = "https://openslides.com" From 30e8f7d87f512bce04d47adac7f422a94eb08c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Wed, 15 Jul 2020 16:16:22 +0200 Subject: [PATCH 3/3] Updated to version 3.3-master --- openslides/__init__.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openslides/__init__.py b/openslides/__init__.py index d46176093..1588a8357 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,6 +1,6 @@ __author__ = "OpenSlides Team " __description__ = "Presentation and assembly system" -__version__ = "3.2" +__version__ = "3.3-master" __license__ = "MIT" __url__ = "https://openslides.com" diff --git a/setup.py b/setup.py index e46c11b35..06a20988b 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ setup( classifiers=[ # http://pypi.python.org/pypi?%3Aaction=list_classifiers # 'Development Status :: 3 - Alpha', - # "Development Status :: 4 - Beta", - 'Development Status :: 5 - Production/Stable', + "Development Status :: 4 - Beta", + # 'Development Status :: 5 - Production/Stable', "Environment :: Web Environment", "Framework :: Django", "License :: OSI Approved :: MIT License",