From 273debf99ab3108821f590548ae5ed6c6374f893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 18 Dec 2020 00:15:58 +0100 Subject: [PATCH 1/3] Readded setup.py --- server/MANIFEST.in | 2 +- server/setup.py | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 server/setup.py diff --git a/server/MANIFEST.in b/server/MANIFEST.in index da73313a7..ea3624721 100644 --- a/server/MANIFEST.in +++ b/server/MANIFEST.in @@ -1,5 +1,5 @@ include AUTHORS -include CHANGELOG +include CHANGELOG.rst include LICENSE include README.rst include SETTINGS.rst diff --git a/server/setup.py b/server/setup.py new file mode 100644 index 000000000..e46c11b35 --- /dev/null +++ b/server/setup.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python + +from setuptools import find_packages, setup + +from openslides import __author__ as openslides_author +from openslides import __description__ as openslides_description +from openslides import __version__ as openslides_version +from openslides import __license__ as openslides_license +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: + install_requires = requirements_production.readlines() + +with open("requirements/big_mode.txt") as requirements_big_mode: + extras_requires = requirements_big_mode.readlines() + +setup( + name="openslides", + author=openslides_author, + author_email="support@openslides.com", + description=openslides_description, + license=openslides_license, + long_description=long_description, + url=openslides_url, + version=openslides_version, + classifiers=[ + # http://pypi.python.org/pypi?%3Aaction=list_classifiers + # 'Development Status :: 3 - Alpha', + # "Development Status :: 4 - Beta", + 'Development Status :: 5 - Production/Stable', + "Environment :: Web Environment", + "Framework :: Django", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + ], + packages=find_packages(exclude=["tests", "tests.*"]), + include_package_data=True, + install_requires=install_requires, + extras_require={"big_mode": extras_requires}, + entry_points={"console_scripts": ["openslides = openslides.__main__:main"]}, +) From a37e2196b3b321a42149e92241f673776b399bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 18 Dec 2020 00:17:27 +0100 Subject: [PATCH 2/3] Release 3.3 --- client/package.json | 2 +- server/openslides/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index cebadc3fe..87ce2ff17 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "OpenSlides3-Client", - "version": "3.2.0", + "version": "3.3.0", "repository": { "type": "git", "url": "git://github.com/OpenSlides/OpenSlides.git" diff --git a/server/openslides/__init__.py b/server/openslides/__init__.py index 1588a8357..fcd2aa0dd 100644 --- a/server/openslides/__init__.py +++ b/server/openslides/__init__.py @@ -1,6 +1,6 @@ __author__ = "OpenSlides Team " __description__ = "Presentation and assembly system" -__version__ = "3.3-master" +__version__ = "3.3" __license__ = "MIT" __url__ = "https://openslides.com" From ef135837f736842d9f250ca44b7290f6f7a8e5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 18 Dec 2020 00:31:57 +0100 Subject: [PATCH 3/3] Update version to 3.4-master --- server/openslides/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/openslides/__init__.py b/server/openslides/__init__.py index fcd2aa0dd..1d027d397 100644 --- a/server/openslides/__init__.py +++ b/server/openslides/__init__.py @@ -1,6 +1,6 @@ __author__ = "OpenSlides Team " __description__ = "Presentation and assembly system" -__version__ = "3.3" +__version__ = "3.4-master" __license__ = "MIT" __url__ = "https://openslides.com"