Skip to content

Commit

Permalink
docs(license): change license from GNU AGPL v3 to CeCILL v2.1 (#182)
Browse files Browse the repository at this point in the history
  • Loading branch information
Deuchnord committed Jun 20, 2021
1 parent b8d0f78 commit 6ffe0ad
Show file tree
Hide file tree
Showing 16 changed files with 600 additions and 834 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| New feature? | yes/no
| Related issues | Fix #... <!-- prefix each issue number with "Fix #", if any -->
| Has BC-break | yes/no
| License | GNU AGPL-v3
| License | CeCILL v2.1

**Checklist:**
<!--
Expand Down
614 changes: 0 additions & 614 deletions LICENSE.md

This file was deleted.

519 changes: 519 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ release: env
@echo -e "\e[1mCreating release with version number \e[36m$$RELEASE_NUMBER\e[0m"
@echo

sed "s/^__version__ =.*/__version__ = '$$RELEASE_NUMBER'/g" _kosmorro/__version__.py > version.py
sed "s/^__version__ =.*/__version__ = \"$$RELEASE_NUMBER\"/g" _kosmorro/__version__.py > version.py
mv version.py _kosmorro/__version__.py

pipenv run python setup.py extract_messages --output-file=_kosmorro/locales/messages.pot > /dev/null
Expand Down
16 changes: 0 additions & 16 deletions _kosmorro/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
18 changes: 1 addition & 17 deletions _kosmorro/__version__.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

__title__ = "kosmorro"
__description__ = "A program that computes your ephemerides"
__url__ = "https://kosmorro.space"
__version__ = '0.10.1'
__version__ = "0.10.1"
__author__ = "Jérôme Deuchnord"
__author_email__ = "jerome@deuchnord.fr"
__license__ = "AGPL"
Expand Down
1 change: 0 additions & 1 deletion _kosmorro/debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ def debug_print(what, force: bool = False):
print_exception(type(what), value=what, tb=None)
else:
print("[DEBUG] %s" % what)

19 changes: 1 addition & 18 deletions _kosmorro/dumper.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from abc import ABC, abstractmethod
import datetime
import json
Expand Down Expand Up @@ -447,8 +431,7 @@ def _make_events(self) -> str:
continue

latex.append(
r"\event{%s}{%s}"
% (event.start_time.strftime(TIME_FORMAT), event_name)
r"\event{%s}{%s}" % (event.start_time.strftime(TIME_FORMAT), event_name)
)

return "".join(latex)
Expand Down
16 changes: 0 additions & 16 deletions _kosmorro/environment.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import os
import re
from pathlib import Path
Expand Down
16 changes: 0 additions & 16 deletions _kosmorro/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from datetime import date
from _kosmorro.i18n.utils import _, SHORT_DATE_FORMAT

Expand Down
11 changes: 9 additions & 2 deletions _kosmorro/i18n/strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@ def from_event(event: Event, with_description: bool = True) -> str:
EventType.OPPOSITION: (_("%s is in opposition"), None),
EventType.CONJUNCTION: (_("%s and %s are in conjunction"), None),
EventType.OCCULTATION: (_("%s occults %s"), None),
EventType.MAXIMAL_ELONGATION: (_("Elongation of %s is maximal"), ('{:.3n}°'.format(event.details['deg']) if type(event.details) is dict else event.details)),
EventType.MAXIMAL_ELONGATION: (
_("Elongation of %s is maximal"),
(
"{:.3n}°".format(event.details["deg"])
if type(event.details) is dict
else event.details
),
),
EventType.MOON_PERIGEE: (_("%s is at its perigee"), None),
EventType.MOON_APOGEE: (_("%s is at its apogee"), None),
}.get(event.event_type)
Expand All @@ -21,7 +28,7 @@ def from_event(event: Event, with_description: bool = True) -> str:
string = string % tuple([from_object(o.identifier) for o in event.objects])

if details is not None and with_description:
return '%s (%s)' % (string, details)
return "%s (%s)" % (string, details)

return string

Expand Down
16 changes: 0 additions & 16 deletions _kosmorro/i18n/utils.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
#!/usr/bin/env python3

# Kosmorro - Compute The Next Ephemerides
# Copyright (C) 2019 Jérôme Deuchnord <jerome@deuchnord.fr>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import gettext
import os

Expand Down

0 comments on commit 6ffe0ad

Please sign in to comment.