new: dev: release prep

nicfit · May 15, 2017 · df6da9a · df6da9a
1 parent 94220b8
commit df6da9a
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 36 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,30 @@ Release History
 
 .. :changelog:
 
+v0.3b4 (2017-05-14) : Triumph Of Death
+-----------------------------------------
+
+New
+~~~
+- Init(scope=False), for wrapped SessionMaker with
+  sqlalchemy.orm.scoped_session.
+- Mishmash.web is optional, and packaged as extra [web] install.
+- Mishmash.VARIOUS_ARTISTS_NAME == gettext("Various Artists")
+
+Changes
+~~~~~~~
+- Removed various artist config and started gettext.
+
+Fix
+~~~
+- Mishmash.web working again.
+
+Other
+~~~~~
+- Update eyed3 from 0.8.0b1 to 0.8 (#108) <[email protected]>
+- Pin pyramid to latest version 1.8.3 (#94) <[email protected]>
+
+
 v0.3b3 (2017-04-09) : Prayers for Rain
 ---------------------------------------
 

diff --git a/docs/mishmash.rst b/docs/mishmash.rst
@@ -12,56 +12,56 @@ Subpackages
 Submodules
 ----------
 
-mishmash.config module
-----------------------
+mishmash\.config module
+-----------------------
 
 .. automodule:: mishmash.config
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.console module
------------------------
+mishmash\.console module
+------------------------
 
 .. automodule:: mishmash.console
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.core module
---------------------
+mishmash\.core module
+---------------------
 
 .. automodule:: mishmash.core
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.database module
-------------------------
+mishmash\.database module
+-------------------------
 
 .. automodule:: mishmash.database
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.library module
------------------------
+mishmash\.library module
+------------------------
 
 .. automodule:: mishmash.library
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.orm module
--------------------
+mishmash\.orm module
+--------------------
 
 .. automodule:: mishmash.orm
     :members:
     :undoc-members:
     :show-inheritance:
 
-mishmash.util module
---------------------
+mishmash\.util module
+---------------------
 
 .. automodule:: mishmash.util
     :members:

diff --git a/requirements.txt b/requirements.txt
@@ -5,40 +5,34 @@
 #    pip-compile --output-file ./requirements.txt requirements.txt
 #
 alembic==0.9.1
-appdirs==1.4.3            # via setuptools
-Chameleon==3.1            # via pyramid-chameleon
+chameleon==3.1            # via pyramid-chameleon
 countrycode==0.2
-eyeD3==0.8
-hupper==0.4.4             # via pyramid
+eyed3==0.8
+hupper==0.5               # via pyramid
 inotify==0.2.8
-Mako==1.0.6               # via alembic, pyramid-mako
-MarkupSafe==1.0           # via mako
+mako==1.0.6               # via alembic, pyramid-mako
+markupsafe==1.0           # via mako
 nicfit.py==0.5.15
-packaging==16.8           # via setuptools
-PasteDeploy==1.5.2        # via pyramid
+pastedeploy==1.5.2        # via pyramid
 psycopg2==2.7.1
 pyfiglet==0.7.5
-Pygments==2.2.0           # via pyramid-debugtoolbar
-pyparsing==2.2.0          # via packaging
+pygments==2.2.0           # via pyramid-debugtoolbar
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==4.0
+pyramid-debugtoolbar==4.0.1
 pyramid-layout==1.0
 pyramid-mako==1.0.2       # via pyramid-debugtoolbar
 pyramid-tm==2.0
 pyramid==1.8.3
 python-editor==1.0.3      # via alembic
 repoze.lru==0.6           # via pyramid, pyramid-debugtoolbar
-six==1.10.0               # via eyed3, packaging, setuptools, sqlalchemy-utils
+six==1.10.0               # via eyed3, sqlalchemy-utils
 sqlalchemy-utils==0.32.14
-SQLAlchemy==1.1.9         # via alembic, sqlalchemy-utils, zope.sqlalchemy
+sqlalchemy==1.1.9         # via alembic, sqlalchemy-utils, zope.sqlalchemy
 transaction==2.1.2
 translationstring==1.3    # via pyramid
-venusian==1.1.0             # via pyramid
+venusian==1.1.0           # via pyramid
 waitress==1.0.2
-WebOb==1.7.2              # via pyramid
+webob==1.7.2              # via pyramid
 zope.deprecation==4.2.0   # via pyramid
-zope.interface==4.4.0     # via pyramid, transaction, zope.sqlalchemy
+zope.interface==4.4.1     # via pyramid, transaction, zope.sqlalchemy
 zope.sqlalchemy==0.7.7
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools                # via pyramid, zope.deprecation, zope.interface, zope.sqlalchemy
diff --git a/requirements/extra_web.txt b/requirements/extra_web.txt
@@ -1,7 +1,7 @@
 pyramid==1.8.3
-pyramid_chameleon==0.3
 pyramid-debugtoolbar==4.0
 pyramid-layout==1.0
+pyramid_chameleon==0.3
 pyramid_tm==2.0
 transaction==2.1.2
 waitress==1.0.2

diff --git a/requirements/requirements.yml b/requirements/requirements.yml
@@ -14,12 +14,12 @@ extra_postgres:
 extra_web:
     - pyramid
     - pyramid_chameleon
-    - pyramid_layout
+    - pyramid-layout
     - pyramid_tm
     - transaction
     - zope.sqlalchemy
     - waitress
-    - pyramid_debugtoolbar
+    - pyramid-debugtoolbar
 
 test:
     - pytest