Skip to content

Commit f3eef38

Browse files
committed
Clean up the README file and license/copyright notices
- Amend `README.rst` - Add metadata to `__init__.py` - Remove license/copyright notices from other places as we are now using `README.rst` for this purpose. - Remove `version.py`
1 parent 18f7993 commit f3eef38

File tree

4 files changed

+48
-53
lines changed

4 files changed

+48
-53
lines changed

README.rst

+34-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
1-
doobie
2-
======
31

4-
Database interface for pytroll
2+
The database interface of `Pytroll <https://pytroll.github.io/>`_
3+
4+
5+
Copyright (C)
6+
2012, 2014, 2015, 2024
7+
8+
Martin Raspaud, Pouria Khalaj, Esben S. Nielsen, Adam Dybbroe, Kristian Rune Larsen
9+
10+
11+
Authors
12+
- Martin Raspaud <[email protected]>
13+
- Pouria Khalaj <[email protected]>
14+
- Esben S. Nielsen <[email protected]>
15+
- Adam Dybbroe <[email protected]>
16+
- Kristian Rune Larsen <[email protected]>
17+
18+
19+
License
20+
This program, i.e. **pytroll-db**, is part of `Pytroll <https://pytroll.github.io/>`_.
21+
22+
**pytroll-db** is free software: you can redistribute it and/or modify
23+
it under the terms of the `GNU General Public License <https://www.gnu.org/licenses/gpl-3.0.en.html>`_
24+
as published by the Free Software Foundation, either version 3 of the License, or
25+
(at your option) any later version.
26+
27+
28+
Disclaimer
29+
This program is distributed in the hope that it will be useful,
30+
but WITHOUT ANY WARRANTY; without even the implied warranty of
31+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
32+
GNU General Public License for more details. You should have
33+
received a copy of the GNU General Public License
34+
along with this program. If not, see <http://www.gnu.org/licenses/>.
35+

bin/pytroll-mongo.py

+6-24
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# Copyright (c) 2019 Martin Raspaud
5-
6-
# Author(s):
7-
8-
# Martin Raspaud <[email protected]>
9-
10-
# This program is free software: you can redistribute it and/or modify
11-
# it under the terms of the GNU General Public License as published by
12-
# the Free Software Foundation, either version 3 of the License, or
13-
# (at your option) any later version.
14-
15-
# This program is distributed in the hope that it will be useful,
16-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
17-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-
# GNU General Public License for more details.
19-
20-
# You should have received a copy of the GNU General Public License
21-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22-
23-
from posttroll.subscriber import Subscribe
244
import logging
25-
from threading import Thread
26-
import yaml
275
import os
6+
from threading import Thread
287

8+
import yaml
9+
from posttroll.subscriber import Subscribe
2910
from pymongo import MongoClient
11+
3012
logger = logging.getLogger(__name__)
3113

3214

@@ -118,8 +100,8 @@ def setup_logging(cmd_args):
118100
help="Log config file to use instead of the standard logging.")
119101
parser.add_argument("-v", "--verbose", dest="verbosity", action="count", default=0,
120102
help="Verbosity (between 1 and 2 occurrences with more leading to more "
121-
"verbose logging). WARN=0, INFO=1, "
122-
"DEBUG=2. This is overridden by the log config file if specified.")
103+
"verbose logging). WARN=0, INFO=1, "
104+
"DEBUG=2. This is overridden by the log config file if specified.")
123105
cmd_args = parser.parse_args()
124106

125107
logger = logging.getLogger("mongo_recorder")

trolldb/__init__.py

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
__author__ = "Martin Raspaud, Pouria Khalaj, Esben S. Nielsen, Adam Dybbroe, Kristian Rune Larsen"
2+
__copyright__ = "Copyright (C) 2012, 2014, 2015, 2024 Martin Raspaud, Pouria Khalaj, Esben S. Nielsen, Adam Dybbroe, Kristian Rune Larsen"
3+
4+
__license__ = "GPLv3"
5+
__version__ = "0.1.0"
6+
__maintainer__ = "Martin Raspaud"
7+
__email__ = "[email protected]"
8+
__status__ = "Production"

trolldb/version.py

-26
This file was deleted.

0 commit comments

Comments
 (0)