Skip to content

Commit e7bd979

Browse files
xisparamonski
authored andcommitted
Release 1.3 (senaite#1314)
* Write code headers * Updated contributors * Added some text in RELEASE_NOTES.rst * Update RELEASE_NOTES.rst * Update RELEASE_NOTES.rst * Updated versions * Updated template of code headers script * Added pypi logo * Updated Readme * Removed trailing whitespace * Updaded code headers * Fix Python scripts (header problem) * Fix bad p close in ar_rejected viewlet * Fix OpenTagError OpenTagError: Tag <div> is not allowed in <h2>, at line 66, column 27 * Updated translations
1 parent b8eee2e commit e7bd979

File tree

643 files changed

+85513
-76495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

643 files changed

+85513
-76495
lines changed

CONTRIBUTING.md

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Contributing to senaite.core
22

3-
Third-party contributions are essential for keeping `senaite.core` continuously
4-
improving. We simply cannot access the huge number of platforms and myriad
5-
configurations for running `senaite.core`. We want to keep it as easy as
6-
possible to contribute changes that get things working in your environment.
7-
There are a few guidelines that we need contributors to follow so that we can
3+
Third-party contributions are essential for keeping `senaite.core` continuously
4+
improving. We simply cannot access the huge number of platforms and myriad
5+
configurations for running `senaite.core`. We want to keep it as easy as
6+
possible to contribute changes that get things working in your environment.
7+
There are a few guidelines that we need contributors to follow so that we can
88
have a chance of keeping on top of things.
99

10-
The following is a set of guidelines for contributing to senaite.core, which is
11-
hosted in the [SENAITE Organization](https://github.com/senaite) on GitHub.
12-
These are just guidelines, not rules. Use your best judgment, and feel free to
10+
The following is a set of guidelines for contributing to senaite.core, which is
11+
hosted in the [SENAITE Organization](https://github.com/senaite) on GitHub.
12+
These are just guidelines, not rules. Use your best judgment, and feel free to
1313
propose changes to this document in a [pull request](#how-to-submit-a-pull-request).
1414

1515
## Code of Conduct
@@ -63,21 +63,21 @@ contribute to the source code.
6363
https://github.com/senaite/senaite.core/fork). This will copy the whole
6464
`senaite.core` repository to your personal account.
6565

66-
3. Then, go to your favourite working folder in your computer and clone your
66+
3. Then, go to your favourite working folder in your computer and clone your
6767
forked repository by typing (replacing ```YOUR_USERNAME``` by
6868
the actual username of your GitHub account):
6969

7070
$ git clone https://github.com/YOUR_USERNAME/senaite.core
7171

72-
4. Your forked repository https://github.com/YOUR_USERNAME/senaite.core will
73-
receive the default name of `origin`. You can also add the original
72+
4. Your forked repository https://github.com/YOUR_USERNAME/senaite.core will
73+
receive the default name of `origin`. You can also add the original
7474
`senaite.core` repository, which is usually called `upstream`:
7575

7676
$ cd senaite.core
7777
$ git remote add upstream https://github.com/senaite/senaite.core.git
7878

79-
To verify the new upstream repository you have specified for your fork, type
80-
`git remote -v`. You should see the URL for your fork as `origin`, and the URL
79+
To verify the new upstream repository you have specified for your fork, type
80+
`git remote -v`. You should see the URL for your fork as `origin`, and the URL
8181
for the original repository as `upstream`:
8282

8383
```
@@ -99,15 +99,15 @@ $ git pull upstream master
9999
```
100100

101101
Now you can do changes, add files, do commits (please take a look at
102-
[how to write good commit messages](https://chris.beams.io/posts/git-commit/)!)
102+
[how to write good commit messages](https://chris.beams.io/posts/git-commit/)!)
103103
and push them to your repository:
104104

105105
```
106106
$ git push origin my_feature
107107
```
108108

109109
If there have been new pushes to the `master` branch of the `upstream`
110-
repository since the last time you pulled from it, you might want to put your
110+
repository since the last time you pulled from it, you might want to put your
111111
commits on top of them (this is mandatory for pull requests):
112112

113113
```
@@ -129,7 +129,7 @@ pros and cons between doing a `gir rebase` or `git merge`. Good documentation on
129129
this regard can be found in the [Atlassian's Merging vs. Rebasing tutorial](
130130
https://www.atlassian.com/git/tutorials/merging-vs-rebasing).
131131

132-
Note this `git rebase` or `git merge` is required for keeping your branch
132+
Note this `git rebase` or `git merge` is required for keeping your branch
133133
aligned with the latest code from the repos. The incorporation of your work into
134134
`master` through a Pull Request will always be done using `git merge`.
135135

@@ -141,15 +141,15 @@ GitHub repository, switch to your `my_feature` branch, and click the
141141
_**Pull Request**_ button, which will do all the work for you. Ensure the
142142
comparison is done with the `master` branch unless you forked from another one.
143143

144-
Once a pull request is sent, the Developer Team will review the set of changes,
144+
Once a pull request is sent, the Developer Team will review the set of changes,
145145
discuss potential modifications, and even push follow-up commits if necessary.
146146

147147
Some things that will increase the chance that your pull request is accepted:
148148

149149
* Write tests.
150150
* Follow [Plone's Python styleguide](https://docs.plone.org/develop/styleguide/python.html).
151151
* Write a descriptive and detailed summary. Please consider that reviewing pull
152-
requests is hard, so include as much information as possible to make your
152+
requests is hard, so include as much information as possible to make your
153153
pull request's intent clear.
154154
* Do not address multiple bugfixes or features in the same Pull Request.
155155
* Include whitespace and formatting changes in discrete commits.
@@ -161,17 +161,17 @@ For more details about Git usage, please check out Chapters 1 and 2 from
161161

162162
## Contributing with new ideas
163163

164-
All suggestions and proposals are welcome. We strongly believe that the
165-
feedback of the community is an important asset to make a better project. With
166-
the aim to get the most of these contributions, but without interfering with
167-
the undergoing work regarding to issues and Pull Requests, we've created a
164+
All suggestions and proposals are welcome. We strongly believe that the
165+
feedback of the community is an important asset to make a better project. With
166+
the aim to get the most of these contributions, but without interfering with
167+
the undergoing work regarding to issues and Pull Requests, we've created a
168168
[Community discussion board](
169-
https://community.senaite.org). This is the right place if
169+
https://community.senaite.org). This is the right place if
170170
you are willing to discuss about new ideas, further steps or improvements.
171171

172-
If you want to keep in touch with the community members and up-to-date
172+
If you want to keep in touch with the community members and up-to-date
173173
with the latest discussions, please join to the [Gitter community channel](
174174
https://gitter.im/senaite/Lobby).
175175

176-
If you want to stay informed about senaite at easy pace, don't forget
176+
If you want to stay informed about senaite at easy pace, don't forget
177177
to subscribe to our [users list](https://sourceforge.net/projects/senaite/lists/senaite-users)

CONTRIBUTORS.rst

+11-5
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,37 @@ Contributions to master, excluding merge commits, sorted by number of
77
contributions descending.
88

99
- Campbell McKellar-Basset, [email protected]
10-
- Jordi Puiggené, jpuiggene@naralabs.com
10+
- Jordi Puiggené, jp@naralabs.com
1111
- Pau Soliva, [email protected]
1212
- Ramon Bartl, [email protected]
1313
- Nihad Mammadli, [email protected]
1414
- Anneline Sweetname, [email protected]
15-
- Juan Gallostra, jgallostra@naralabs.com
15+
- Juan Gallostra, [email protected].com
1616
- Godfrey Leibbrandt, [email protected]
1717
- Mike Metcalfe, [email protected]
1818
- Jurie-Jan Botha, [email protected]
19-
- Inus Scheepers, [email protected]
2019
- Lunga Baliwe, [email protected]
20+
- Inus Scheepers, [email protected]
2121
- Oliver Roch, [email protected]
2222
- Alexander Karlsson, [email protected]
2323
- Anton Feun, [email protected]
2424
- Jayadeep Karnati, [email protected]
2525
2626
- Dhruv Khattar, [email protected]
2727
- witekdev, [email protected]
28+
- Anderson Smith, [email protected]
2829
- Javis Sullivan, [email protected]
2930
- Pieter van der Merwe, [email protected]
30-
- Anderson Smith, [email protected]
3131
- Jean Jordaan, [email protected]
32+
- MoffatMore, [email protected]
33+
- krishan Chopra, [email protected]
34+
- jpsinghgoud, [email protected]
35+
- Stefan Gruber, [email protected]
3236
- Aleksandr Melnikov, [email protected]
3337
- Henrique Chehad, [email protected]
34-
- jpsinghgoud, [email protected]
3538
- goelakash, [email protected]
3639
- Manav Batra, [email protected]
40+
- mimishons, [email protected]
3741

3842

3943
Translators
@@ -134,5 +138,7 @@ Translators
134138
- yuan314159, [email protected], Chinese (China) (zh_CN)
135139
- Cheng Jin, [email protected], Chinese (China) (zh_CN)
136140
- Inus Scheepers, [email protected], Chinese (China) (zh_CN)
141+
- prosper wang, [email protected], Chinese (China) (zh_CN)
137142
- Rui Tang, [email protected], Chinese (Taiwan) (zh_TW)
138143
- Matthew Tsui, [email protected], Chinese (Taiwan) (zh_TW)
144+
- Liz Sung, [email protected], Chinese (Taiwan) (zh_TW)

README.rst

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
.. raw:: html
1+
.. image:: https://raw.githubusercontent.com/senaite/senaite.core/master/static/logo_pypi.png
2+
:target: https://github.com/senaite/senaite.core
3+
:alt: senaite.core
4+
:height: 128px
25

3-
<div align="center">
4-
<h1>
5-
<a href="https://github.com/senaite/senaite.core">
6-
<div>
7-
<img src="https://raw.githubusercontent.com/senaite/senaite.core/master/static/senaite-logo.png" alt="senaite.core" height="64" />
8-
</div>
9-
</a>
10-
</h1>
11-
</div>
12-
13-
— **SENAITE.CORE**: *Open Source LIMS Core based on the CMS Plone*
6+
*Open Source LIMS Core based on the CMS Plone*
7+
==============================================
148

159
.. image:: https://img.shields.io/pypi/v/senaite.core.svg?style=flat-square
1610
:target: https://pypi.python.org/pypi/senaite.core
@@ -30,6 +24,12 @@
3024
.. image:: https://img.shields.io/github/contributors/senaite/senaite.core.svg?style=flat-square
3125
:target: https://github.com/senaite/senaite.core/blob/master/CONTRIBUTORS.rst
3226

27+
.. image:: https://img.shields.io/badge/Built%20with-%E2%9D%A4-red.svg
28+
:target: https://github.com/senaite/senaite.core
29+
30+
.. image:: https://img.shields.io/badge/Made%20for%20SENAITE-%E2%AC%A1-lightgrey.svg
31+
:target: https://www.senaite.com
32+
3333

3434
Introduction
3535
============
@@ -79,7 +79,7 @@ Feedback and support
7979
License
8080
=======
8181

82-
**SENAITE.CORE** Copyright (C) 2018 Senaite Foundation
82+
**SENAITE.CORE** Copyright (C) 2018-2019 Senaite Foundation
8383

8484
This software, henceforth "SENAITE.CORE" is an add-on for the
8585
`Plone CMS <https://plone.org/>`_ and a derivative work of BIKA LIMS.

RELEASE_NOTES.rst

+42-21
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,40 @@ Update from 1.2.9 to 1.3.0
66

77
**IMPORTANT: Plan the upgrade with enough time**
88

9-
Version 1.3.0 is not a hotfixes release, so this update comes with a lot of
10-
changes that require additional care when planning the update. If you have your
11-
own add-on, please review the changes to see beforehand if some parts of your
12-
add-on need to be modified.
13-
14-
Amongst these changes, the refactoring of Workflows logic will have a huge
15-
impact on how long this update will require for its completion.
16-
17-
To reduce the time for the upgrade to complete, we suggest the following tips:
18-
19-
- Do a backup of both your code and the database before proceed.
20-
21-
- Try to have as much analyses in verified state as possible.
9+
Version 1.3.0 is not a hotfix release, it rather comes with a lot of changes
10+
that require additional care when planning the update. If you have your own
11+
add-on, please review the changes to check beforehand if some parts of your
12+
add-on require modifications.
13+
14+
This update will take long (up to 5h for instances with large amounts of data).
15+
Therefore, is recommended to plan and allocate enough resources for the process
16+
to complete beforehand. For big databases, RAM is a critical factor to be
17+
considered before upgrading. Worth to mention that the following tips are
18+
strongly recommended before proceeding with the upgrade:
19+
20+
- Do a zeopack
21+
- Do a backup of both your code and database
22+
- Try to have as much analyses in verified/published statuses as possible
23+
- Stop unnecessary applications and services that may consume RAM
24+
- Start with a clean log file
25+
26+
Most of the base code has been refactored keeping in mind the following
27+
objectives:
28+
29+
- Less complexity: less code, better code
30+
- High test coverage: lower chance of undetected bugs
31+
- Boost performance: better experience, with no delays
32+
- Improve security: rely on Zope's security policies
33+
- Code responsibility: focus on core functionalities and let other add-ons to
34+
deal with the rest (`senaite.lims`, `senaite.core.listing`, etc.)
35+
36+
Besides of this refactoring, this version also comes with a myriad of new
37+
functionalities and enhancements: full-fledged sample partitions, reinvented
38+
listings and results entry, new adapters for extensibility, etc.
39+
40+
Version 1.3 is the result of hard, but exciting work at same time. Four months
41+
of walking through valleys of tears and fighting hydras. Four exciting months to
42+
be proud of.
2243

2344

2445
Update from 1.2.8 to 1.2.9
@@ -28,17 +49,17 @@ Update from 1.2.8 to 1.2.9
2849
This update might take long depending on the number of Analyses, Analysis
2950
Requests and Samples registered in the system:
3051

31-
- Role mappings updated for Analaysis Requests and Samples (rejection)
32-
https://github.com/senaite/senaite.core/pull/1041
52+
- Role mappings updated for Analaysis Requests and Samples (rejection)
53+
https://github.com/senaite/senaite.core/pull/1041
3354

34-
- Recatalog of invalidated/retest Analysis Requests (invalidation)
35-
https://github.com/senaite/senaite.core/pull/1027
55+
- Recatalog of invalidated/retest Analysis Requests (invalidation)
56+
https://github.com/senaite/senaite.core/pull/1027
3657

37-
- Reindex and recatalog of getDueDate for Analysis Requests
38-
https://github.com/senaite/senaite.core/pull/1051
58+
- Reindex and recatalog of getDueDate for Analysis Requests
59+
https://github.com/senaite/senaite.core/pull/1051
3960

40-
- Reindex of getDueDate for Analyses
41-
https://github.com/senaite/senaite.core/pull/1032
61+
- Reindex of getDueDate for Analyses:
62+
https://github.com/senaite/senaite.core/pull/1032
4263

4364
- Workflow: `retract_ar` transition has been renamed to `invalidate`
4465
https://github.com/senaite/senaite.core/pull/1027

bika/__init__.py

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
# This file is part of Bika LIMS
1+
# -*- coding: utf-8 -*-
22
#
3-
# Copyright 2011-2016 by it's authors.
4-
# Some rights reserved. See LICENSE.txt, AUTHORS.txt.
3+
# This file is part of SENAITE.CORE.
4+
#
5+
# SENAITE.CORE is free software: you can redistribute it and/or modify it under
6+
# the terms of the GNU General Public License as published by the Free Software
7+
# Foundation, version 2.
8+
#
9+
# This program is distributed in the hope that it will be useful, but WITHOUT
10+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11+
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12+
# details.
13+
#
14+
# You should have received a copy of the GNU General Public License along with
15+
# this program; if not, write to the Free Software Foundation, Inc., 51
16+
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
#
18+
# Copyright 2018-2019 by it's authors.
19+
# Some rights reserved, see README and LICENSE.
520

6-
# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
721
try:
822
__import__('pkg_resources').declare_namespace(__name__)
923
except ImportError:

bika/lims/__init__.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of SENAITE.CORE
3+
# This file is part of SENAITE.CORE.
44
#
5-
# Copyright 2018 by it's authors.
6-
# Some rights reserved. See LICENSE.rst, CONTRIBUTORS.rst.
5+
# SENAITE.CORE is free software: you can redistribute it and/or modify it under
6+
# the terms of the GNU General Public License as published by the Free Software
7+
# Foundation, version 2.
8+
#
9+
# This program is distributed in the hope that it will be useful, but WITHOUT
10+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11+
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12+
# details.
13+
#
14+
# You should have received a copy of the GNU General Public License along with
15+
# this program; if not, write to the Free Software Foundation, Inc., 51
16+
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
#
18+
# Copyright 2018-2019 by it's authors.
19+
# Some rights reserved, see README and LICENSE.
720

821
import logging
922
import warnings

bika/lims/adapters/__init__.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of SENAITE.CORE
3+
# This file is part of SENAITE.CORE.
44
#
5-
# Copyright 2018 by it's authors.
6-
# Some rights reserved. See LICENSE.rst, CONTRIBUTORS.rst.
5+
# SENAITE.CORE is free software: you can redistribute it and/or modify it under
6+
# the terms of the GNU General Public License as published by the Free Software
7+
# Foundation, version 2.
8+
#
9+
# This program is distributed in the hope that it will be useful, but WITHOUT
10+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11+
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
12+
# details.
13+
#
14+
# You should have received a copy of the GNU General Public License along with
15+
# this program; if not, write to the Free Software Foundation, Inc., 51
16+
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
#
18+
# Copyright 2018-2019 by it's authors.
19+
# Some rights reserved, see README and LICENSE.

0 commit comments

Comments
 (0)