Merge pull request #532 from senaite/release-1.2.0

v1.1.9 to v1.2.0

Author: xispa

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ## Description of the issue/feature this PR addresses
 
-Linked issue: https://github.com/senaite/bika.lims/issues/
+Linked issue: https://github.com/senaite/senaite.core/issues/
 
 ## Current behavior before PR
 

.travis.yml

@@ -38,4 +38,4 @@ before_install:
 install:
   - bin/buildout -n -t 3 -c travis.cfg
 script:
-  - bin/test -m senaite.core
+  - bin/test -m bika.lims

CHANGES.rst

@@ -1,26 +1,7 @@
 Changelog
 =========
 
-1.1.10 (unreleased)
--------------------
-
-**Added**
-
-
-**Removed**
-
-
-**Changed**
-
-
-**Fixed**
-
-
-**Security**
-
-
-
-1.1.9 (2018-01-03)
+1.2.0 (2018-01-03)
 ------------------
 
 **Added**

README.rst

@@ -29,7 +29,7 @@ Introduction
 
 SENAITE.CORE is an Open Source Laboratory Information Management System (LIMS)
 for enterprise environments, especially focused to behave with high speed,
-excellent performance and good stability. 
+excellent performance and good stability.
 
 This software is a derivative work of `Bika LIMS <https://github.com/bikalims/bika.lims>`_
 software and comes with the same user interface. Since SENAITE.CORE provides the
@@ -61,6 +61,7 @@ Create a new buildout file ``senaite.cfg`` which extends your existing
 your main buildout.cfg which you can also use on the production server::
 
   [buildout]
+  index = https://pypi.python.org/simple
   extends = buildout.cfg
 
   [instance]
@@ -85,7 +86,7 @@ Installation for development
 
 This is the recommended approach how to enable ``senaite.core`` for your
 development environment. With this approach, you'll be able to download the
-latest source code from `senaite.core's repository <https://github.com/senaite/senaite.core>`_ 
+latest source code from `senaite.core's repository <https://github.com/senaite/senaite.core>`_
 and contribute as well.
 
 Use git to fetch ``senaite.core`` source code to your buildout environment::
@@ -100,6 +101,7 @@ from your main buildout.cfg which you can also use on the production server.
 ``senaite.cfg``::
 
   [buildout]
+  index = https://pypi.python.org/simple
   extends = buildout.cfg
   develop +=
       src/senaite.core
@@ -122,7 +124,7 @@ Contribute
 ==========
 
 We want contributing to SENAITE.CORE to be fun, enjoyable, and educational for
-anyone, and everyone. This project adheres to the `Contributor Covenant <https://github.com/senaite/senaite.core/blob/master/CODE_OF_CONDUCT.md>`_. 
+anyone, and everyone. This project adheres to the `Contributor Covenant <https://github.com/senaite/senaite.core/blob/master/CODE_OF_CONDUCT.md>`_.
 By participating, you are expected to uphold this code. Please report
 unacceptable behavior.
 
@@ -135,5 +137,5 @@ document <https://github.com/senaite/senaite.core/blob/master/CONTRIBUTING.md>`_
 Feedback and support
 ====================
 
-* `Gitter channel <https://gitter.im/senaite/Lobby>`_ 
+* `Gitter channel <https://gitter.im/senaite/Lobby>`_
 * `Users list <https://sourceforge.net/projects/senaite/lists/senaite-users>`_

bika/lims/browser/senaite-frontpage.zcml

@@ -7,8 +7,8 @@
 
     <!-- TODO: TO BE REMOVED
     It is only used to prevent an ugly Traceback when the instance hasn't been
-    yet upgraded to 1.1.9. If authenticated, displays a landing page telling the
-    user to upgrade to 1.1.9. If not authenticated, redirects to login page as
+    yet upgraded to 1.2.0. If authenticated, displays a landing page telling the
+    user to upgrade to 1.2.0. If not authenticated, redirects to login page as
     usual.-->
     <browser:page
         for="Products.CMFPlone.interfaces.IPloneSiteRoot"

bika/lims/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1.1.10</version>
+  <version>1.2.0</version>
   <dependencies>
     <dependency>profile-jarn.jsi18n:default</dependency>
     <dependency>profile-Products.ATExtensions:default</dependency>

bika/lims/upgrade/configure.zcml

@@ -81,17 +81,17 @@
        profile="bika.lims:default"/>
 
  <genericsetup:upgradeStep
-       title="Upgrade to SENAITE.CORE 1.1.9"
+       title="Upgrade to SENAITE.CORE 1.2.0"
        source="1.1.8"
-       destination="1.1.9"
-       handler="bika.lims.upgrade.v01_01_009.upgrade"
+       destination="1.2.0"
+       handler="bika.lims.upgrade.v01_02_000.upgrade"
        profile="bika.lims:default"/>
 
  <genericsetup:upgradeStep
-       title="Upgrade to SENAITE.CORE 1.1.10"
+       title="Upgrade to SENAITE.CORE 1.2.0"
        source="1.1.9"
-       destination="1.1.10"
-       handler="bika.lims.upgrade.v01_01_010.upgrade"
+       destination="1.2.0"
+       handler="bika.lims.upgrade.v01_02_000.upgrade"
        profile="bika.lims:default"/>
 
 </configure>

bika/lims/upgrade/v01_01_010.py

@@ -13,7 +13,7 @@
 from Products.CMFCore.Expression import Expression
 from bika.lims.utils import changeWorkflowState
 
-version = '1.1.9'  # Remember version number in metadata.xml and setup.py
+version = '1.2.0'  # Remember version number in metadata.xml and setup.py
 profile = 'profile-{0}:default'.format(product)
 
 @upgradestep(product, version)

bika/lims/upgrade/v01_01_009.py bika/lims/upgrade/v01_02_000.py

@@ -5,7 +5,7 @@
 
 from setuptools import setup, find_packages
 
-version = '1.1.10'
+version = '1.2.0'
 
 setup(
     name='senaite.core',

setup.py

@@ -1,10 +1,6 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/travis-4.3.x.cfg
-package-name = senaite.core
-package-extras = [test]
-test-eggs =
-    senaite.core
+    buildout.cfg
 
 # network speedup
 socket-timeout = 5
@@ -13,16 +9,4 @@ allow-hosts =
     docutils.sourceforge.net
     prdownloads.sourceforge.net
     effbot.org
-    dist.plone.org
-
-[versions]
-Plone = 4.3.15
-zc.buildout =
-setuptools =
-CairoSVG = 1.0.20
-Sphinx = 1.1.3
-zc.recipe.egg = 1.3.2
-zope.pagetemplate = 3.6.3
-plone.recipe.codeanalysis = 1.0b5
-mock = 1.0.1
-five.pt = 2.2.4
+    dist.plone.org