Merge pull request #1233 from normanjaeckel/ChangelogAndOthers

Changelog and other metadata files
This commit is contained in:
Norman Jäckel 2014-03-31 21:39:49 +02:00
commit 74bf3b58f9
6 changed files with 44 additions and 28 deletions

View File

@ -8,16 +8,24 @@ Version 1.5.1 (unreleased)
==========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=15]
Projector:
- Fixed path and config help text for logo on the projector.
Agenda:
- Fixed permission error in list of speakers widget.
- Fixed permission error in the list of speakers widget.
- Fixed Item instance method is_active_slide().
Motion:
- Fixed sorting of motions concerning the identifier. Used natsort and
DataTables Natural Sort Plugin.
Participant:
- Added permission to see participants also to the manager group.
- Added permission to see participants to the manager group.
- Fixed user status view for use without Javascript.
Files:
- Fixed error when a file was removed from filesystem.
- Fixed error when an uploaded file was removed from filesystem.
Other:
- Used unicode font for circle in ballot pdf. Removed pillow dependency package.
- Set minimum Python version to 2.6.9. Fixed setup file for use with Python 2.6.
- Used unicode font for circle in ballot pdf. Removed Pillow dependency package.
- Fixed http status code when requesting a non-existing static page using
Tordado web server.
Tornado web server.
- Fixed error in main script when using other database engine.

View File

@ -67,6 +67,11 @@ Installation on GNU/Linux or Mac OS X
OpenSlides will install all required python packages (see
requirements_production.txt).
If you use Python 2.6.x, you have to add the option `--allow-external
argparse` to the pip command::
$ pip install --allow-external argparse openslides
Installation on Windows
-----------------------
@ -81,10 +86,11 @@ portable version you should observe the following install steps.*
and Setuptools on your system.
a. Download and run the `Python 32-bit MSI installer
<http://www.python.org/ftp/python/2.7.5/python-2.7.5.msi>`_. Note
<http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi>`_. Note
that the 32-bit MSI installer is required even on a 64-bit Windows
system. If you use the 64-bit MSI installer, step 3 of this
instruction will fail unless you installed the packages reportlab manually.
instruction will fail unless you installed the packages reportlab
manually.
b. Add python directories to PATH (via Control Panel > System >
Advanced): ``";C:\\Python27;C:\\Python27\\Scripts"``. Note that the path
@ -104,7 +110,7 @@ portable version you should observe the following install steps.*
To install Virtual Python Environment builder, open command line (cmd)
and run::
> easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.10.1.tar.gz
> easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.11.4.tar.gz
Create your OpenSlides directory, change to it, setup and activate the
virtual environment::
@ -208,6 +214,11 @@ Installation and start of the development version
$ pip install -r requirements.txt
If you use Python 2.6.x, you have to add the option `--allow-external
argparse` to the pip command::
$ pip install --allow-external argparse -r requirements.txt
For Windows run::
> easy_install # Insert all packages from requirements.txt and requirements_production.txt here
@ -227,8 +238,7 @@ Coding Style
------------
You can find some information on the coding style in the `OpenSlides wiki
<https://github.com/OpenSlides/OpenSlides/wiki/De%3ACode-Richtlinien-f%C3%BCr
-Openslides>`_.
<https://github.com/OpenSlides/OpenSlides/wiki/De%3ACode-Richtlinien-f%C3%BCr-Openslides>`_.
VI. Used software
@ -270,7 +280,8 @@ OpenSlides uses the following projects or parts of them:
* `Sphinx <http://sphinx-doc.org/>`_, License: BSD
* Sphinx extension `autoimage <https://gist.github.com/kroger/3856821/>`_, License: MIT
* Sphinx extension `autoimage <https://gist.github.com/kroger/3856821/>`_,
License: MIT
* `Sphinx Bootstrap Theme
<http://ryan-roemer.github.io/sphinx-bootstrap-theme/>`_, License: MIT

View File

@ -2,11 +2,11 @@
-r requirements_production.txt
# Requirements for development and tests in alphabetical order
Fabric==1.8.0
coverage==3.7
flake8==2.0
Fabric==1.8.3
coverage==3.7.1
flake8==2.1.0
mock==1.0.1
# Requirements for OpenSlides handbook/documentation in alphabetical order
Sphinx==1.2b3
sphinx-bootstrap-theme==0.2.4
Sphinx==1.2.2
sphinx-bootstrap-theme==0.4.0

View File

@ -4,10 +4,10 @@ beautifulsoup4>=4.3,<4.4
bleach>=1.2,<1.3
django-haystack>=2.1,<2.2
django-mptt>=0.6,<0.7
natsort>=3.0,<3.1
natsort>=3.1,<3.2
reportlab>=2.7,<2.8
sockjs-tornado>=1.0,<1.1
tornado>=3.1,<3.2
tornado>=3.1,<3.3
whoosh>=2.5,<2.6
# For Python 2.6 support

View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import re
import sys
from setuptools import setup, find_packages
@ -12,13 +13,10 @@ with open('README.rst') as readme:
long_description = readme.read()
dependency_line = re.compile('[^#-]')
with open('requirements_production.txt') as requirements_production:
install_requires = requirements_production.readlines()
# For Python 2.6 support
if sys.version_info[1] == 6:
install_requires.append('argparse>=1.2,<1.3')
install_requires = [line for line in requirements_production.readlines()
if dependency_line.match(line)]
setup(
@ -33,11 +31,10 @@ setup(
# http://pypi.python.org/pypi?%3Aaction=list_classifiers
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Intended Audience :: Other Audience',
'Framework :: Django',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
],
license='MIT',
packages=find_packages(exclude=['tests', 'tests.*']),

View File

@ -234,8 +234,8 @@ class ConfigWeightTest(TestCase):
def test_order_of_config_pages_abstract(self):
config_page_dict = {}
for receiver, config_page in config_signal.send(sender=self):
config_page_dict[receiver.__name__] = config_page
for signal_receiver, config_page in config_signal.send(sender=self):
config_page_dict[signal_receiver.__name__] = config_page
self.assertGreater(config_page_dict['set_grouped_config_page'].weight, config_page_dict['set_simple_config_page'].weight)
def test_order_of_config_pages_on_view(self):