diff --git a/.travis.yml b/.travis.yml index 21ada7602..13aa08de0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ language: python python: - "2.6" - "2.7" -install: "pip install -r requirements.txt" +install: "pip install --allow-external argparse -r requirements.txt" script: "fab travis_ci" diff --git a/CHANGELOG b/CHANGELOG index 11b2ed524..38a8b6c16 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,39 +8,45 @@ Version 1.6 (unreleased) ======================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=14] +Dashboard: +- Added shortcuts for the countdown. Agenda: - New projector view with the current list of speakers. - Added CSV import. - Added automatic numbering of agenda items. - Fixed organizational item structuring. +Motions: +- New slide for vote results. Assignment: - Coupled assignment candidates with list of speakers. -Dashboard: -- Shortcuts for the countdown. +- Created a poll description field for each assignment poll. +- New slide for election results. Participants: -- Disabled widgets by default. +- Disabled dashboard widgets by default. - Added form field for multiple creation of new participants. Files: - Enabled update and delete view for uploader refering to his own files. Other: -- New config option to set the 100% base for polls (motions/elections). +- Added global chatbox for managers. +- New config option to set the 100 % base for polls (motions/elections). +- Changed api for plugins. Used entry points to detect them automaticly. Load + them automaticly from plugin directory of Windows portable version. +- Added possibility to use custom templates and static files in user data path + directory. - Changed widget api. Used new metaclass. -- Changed api for plugins. Used entry points to detect them automaticly. +- Changed api for main menu entries. Used new metaclass. +- Inserted api for the personal info widget. Used new metaclass. - Renamed config api classes. - Regrouped config collections and pages. - Renamed some classes of the poll api. +- Added api for absolute urls in models. - Inserted command line option to translate config strings during database setup. -- Inserted api for the personal info widget. -- Changed api for main menu entries. - Enhanced http error pages. +- Fixed headings on custom slides without text. - Moved dashboard and select widgets view from projector to core app. -- Created a poll description field for each assignment-poll. -- Added possibility to use custom templates and static files in user data path - directory. -- Added global chatbox for managers. - -Version 1.5.2 (unreleased) -========================== +- Renamed and cleaned up static direcories. +- Used jsonfield as required package. Removed jsonfield code. +- Added new package backports.ssl_match_hostname for portable build script. Version 1.5.1 (2014-03-31) diff --git a/README.rst b/README.rst index 105cfc79a..571adcc66 100644 --- a/README.rst +++ b/README.rst @@ -89,7 +89,7 @@ portable version you should observe the following install steps.* `_. 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 + instruction will fail unless you installed the package reportlab manually. b. Add python directories to PATH (via Control Panel > System > @@ -98,7 +98,7 @@ portable version you should observe the following install steps.* c. Download and run (via double click) the last `install script ez_setup.py for Setuptools - `_. + `_. 2. Setup a virtual environment with Virtual Python Environment builder (optional) @@ -246,6 +246,9 @@ VI. Used software OpenSlides uses the following projects or parts of them: +* `backports.ssl_match_hostname `_, + License: Python Software Foundation License + * `Beautiful Soup `_, License: MIT @@ -274,6 +277,9 @@ OpenSlides uses the following projects or parts of them: * `roman `_, License: Python 2.1.1 +* `setuptools `_, + License: Python Software Foundation License + * `sockjs-client `_, License: MIT diff --git a/openslides/__init__.py b/openslides/__init__.py index 926e702bd..da177e787 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -VERSION = (1, 6, 0, 'alpha', 1) # During development it is the next release +VERSION = (1, 6, 0, 'beta', 2) # During development it is the next release RELEASE = False diff --git a/requirements_production.txt b/requirements_production.txt index 3e2480a56..7accd2074 100644 --- a/requirements_production.txt +++ b/requirements_production.txt @@ -14,5 +14,4 @@ tornado>=3.1,<3.3 whoosh>=2.5.6,<2.6 # For Python 2.6 support ---allow-external argparse argparse==1.2.1 diff --git a/setup.py b/setup.py index 5d5a35d90..5e007b018 100644 --- a/setup.py +++ b/setup.py @@ -13,10 +13,8 @@ with open('README.rst') as readme: long_description = readme.read() -dependency_line = re.compile('[^#-]') with open('requirements_production.txt') as requirements_production: - install_requires = [line for line in requirements_production.readlines() - if dependency_line.match(line)] + install_requires = requirements_production.readlines() setup(