ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2084 from normanjaeckel/Release-2.0

Browse Source 
Release 2.0
This commit is contained in:
Norman Jäckel 2016-04-17 22:57:18 +02:00
commit 8548a0390d
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -4,8 +4,13 @@
https://openslides.org/ https://openslides.org/
Version 2.0 (unreleased) Version 2.0.1 (unreleased)
========================== ==========================
[https://github.com/OpenSlides/OpenSlides/milestones/2.0.1]
Version 2.0 (2016-04-18)
========================
[https://github.com/OpenSlides/OpenSlides/milestones/2.0] [https://github.com/OpenSlides/OpenSlides/milestones/2.0]
OpenSlides 2.0 is essentially not compatible to OpenSlides 1.7. E. g. OpenSlides 2.0 is essentially not compatible to OpenSlides 1.7. E. g.

5
MANIFEST.in
View File

@ -5,7 +5,4 @@ include README.rst
include requirements_production.txt include requirements_production.txt
include bower.json include bower.json
recursive-include openslides *.* recursive-include openslides *.*
recursive-exclude openslides *.pyc exclude openslides/__pycache__/*
recursive-exclude openslides *.swp
recursive-exclude openslides *.swo
recursive-exclude openslides *~

2
openslides/__init__.py
View File

@ -1,3 +1,3 @@
__author__ = 'OpenSlides Team <support@openslides.org>' __author__ = 'OpenSlides Team <support@openslides.org>'
__description__ = 'Presentation and assembly system' __description__ = 'Presentation and assembly system'
__version__ = '2.0-dev' __version__ = '2.0.1-dev'

6
setup.py
View File

@ -19,14 +19,14 @@ setup(
description=openslides_description, description=openslides_description,
license='MIT', license='MIT',
long_description=long_description, long_description=long_description,
url='http://openslides.org', url='https://openslides.org',
version=openslides_version, version=openslides_version,
classifiers=[ classifiers=[
# http://pypi.python.org/pypi?%3Aaction=list_classifiers # http://pypi.python.org/pypi?%3Aaction=list_classifiers
# 'Development Status :: 3 - Alpha', # 'Development Status :: 3 - Alpha',
'Development Status :: 4 - Beta', # 'Development Status :: 4 - Beta',
# 'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment', 'Environment :: Web Environment',
'Framework :: Django', 'Framework :: Django',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',