Просмотр исходного кода

Merge branch 'master' into features

pull/232/merge
Jérôme Deuchnord 2 лет назад
Родитель
Сommit
91073e0742
10 измененных файлов: 239 добавлений и 139 удалений
  1. +42
    -0
      .github/workflows/appimage.yml
  2. +6
    -0
      .gitignore
  3. +66
    -0
      AppImageBuilder.yml
  4. +34
    -25
      CHANGELOG.md
  5. +9
    -2
      Makefile
  6. +39
    -53
      Pipfile.lock
  7. +1
    -1
      _kosmorro/__version__.py
  8. +42
    -53
      _kosmorro/locales/messages.pot
  9. +0
    -2
      _kosmorro/main.py
  10. +0
    -3
      kosmorro

+ 42
- 0
.github/workflows/appimage.yml Просмотреть файл

@@ -0,0 +1,42 @@
name: AppImage

on:
pull_request:
branches: [master, features]
release:

jobs:
build-appimage:
name: Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Prepare environment
run: |
sudo gem install ronn
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
sudo chmod +x /usr/local/bin/appimagetool
pip install -U pip pipenv Babel wheel appimage-builder
pipenv install --dev

- name: Build wheel
run: |
make i18n build

- name: Build AppImage
run: |
make appimage

- name: Upload AppImage
uses: actions/upload-artifact@v2
with:
name: kosmorro.AppImage
path: dist/kosmorro-latest-x86_64.AppImage

- name: Upload AppImage version synchronization file
uses: actions/upload-artifact@v2
with:
name: kosmorro.AppImage.zsync
path: dist/kosmorro-latest-x86_64.AppImage.zsync

+ 6
- 0
.gitignore Просмотреть файл

@@ -17,3 +17,9 @@ coverage.xml

# GitPod-specific:
/.vscode/**

# AppImage builds
/AppDir
/appimage-builder-cache
*.AppImage
*.AppImage.zsync

+ 66
- 0
AppImageBuilder.yml Просмотреть файл

@@ -0,0 +1,66 @@
# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
version: 1

script: |
mkdir -p build/AppDir build/AppDir/usr/share/icons/hicolor/scalable/apps
cp _kosmorro/assets/svg/kosmorro-icon.svg build/AppDir/usr/share/icons/hicolor/scalable/apps/kosmorro.svg
pip3 install --isolated --root="./build/AppDir" ./dist/kosmorro-*.whl

AppDir:
path: build/AppDir
app_info:
id: space.kosmorro.cli
name: kosmorro
icon: kosmorro
version: latest
exec: usr/bin/python3
exec_args: $APPDIR/usr/local/bin/kosmorro $@

apt:
arch: amd64
allow_unauthenticated: true
sources:
- sourceline: deb http://archive.ubuntu.com/ubuntu/ focal main restricted
- sourceline: deb http://archive.ubuntu.com/ubuntu/ focal universe restricted
include:
- python3
- python3-certifi
- python3-dateutil

files:
include:
- /usr/bin/sh
- /usr/bin/bash
- /usr/bin/env
exclude:
- usr/share/man
- usr/share/doc/*/README.*
- usr/share/doc/*/changelog.*
- usr/share/doc/*/NEWS.*
- usr/share/doc/*/TODO.*

test:
fedora-30:
image: appimagecrafters/tests-env:fedora-33
command: ./AppRun --latitude=50.5824 --longitude=3.0624
use_host_x: true
debian-stable:
image: appimagecrafters/tests-env:debian-stable
command: ./AppRun --latitude=50.5824 --longitude=3.0624
use_host_x: true
archlinux-latest:
image: appimagecrafters/tests-env:archlinux-latest
command: ./AppRun --latitude=50.5824 --longitude=3.0624
use_host_x: true
centos-7:
image: appimagecrafters/tests-env:centos-7
command: ./AppRun --latitude=50.5824 --longitude=3.0624
use_host_x: true
ubuntu-xenial:
image: appimagecrafters/tests-env:ubuntu-xenial
command: ./AppRun --latitude=50.5824 --longitude=3.0624
use_host_x: true

AppImage:
arch: x86_64
update-information: gh-releases-zsync|Kosmorro|kosmorro|latest|Kosmorro-*x86_64.AppImage.zsync

+ 34
- 25
CHANGELOG.md Просмотреть файл

@@ -1,4 +1,13 @@
# [v0.10.7](https://github.com/Kosmorro/kosmorro/compare/v0.10.6...v0.10.7) (2021-12-04)
# [Version 0.10.8](https://github.com/Kosmorro/kosmorro/compare/v0.10.7...v0.10.8) (2022-01-10)


### Bug Fixes

* fix locale support that led to an exception ([38571c3](https://github.com/Kosmorro/kosmorro/commit/38571c3084edfec6cafeac16755dde2cd6c5ee66))



# [Version 0.10.7](https://github.com/Kosmorro/kosmorro/compare/v0.10.6...v0.10.7) (2021-12-04)


### Bug Fixes
@@ -7,7 +16,7 @@



# [v0.10.6](https://github.com/Kosmorro/kosmorro/compare/v0.10.5...v0.10.6) (2021-11-20)
# [Version 0.10.6](https://github.com/Kosmorro/kosmorro/compare/v0.10.5...v0.10.6) (2021-11-20)


### Bug Fixes
@@ -17,7 +26,7 @@



# [v0.10.5](https://github.com/Kosmorro/kosmorro/compare/v0.10.4...v0.10.5) (2021-11-09)
# [Version 0.10.5](https://github.com/Kosmorro/kosmorro/compare/v0.10.4...v0.10.5) (2021-11-09)


### Bug Fixes
@@ -27,14 +36,14 @@



# [v0.10.4](https://github.com/Kosmorro/kosmorro/compare/v0.10.3...v0.10.4) (2021-11-01)
# [Version 0.10.4](https://github.com/Kosmorro/kosmorro/compare/v0.10.3...v0.10.4) (2021-11-01)

This version is empty and contains exactly the same things as v0.10.3.
It has been created because of a manipulation mistake that led to the creation of a wrong version on PyPI.

If v0.10.3 does not exist on your distribution, install v0.10.4, and you will have exactly the same thing.

# [v0.10.3](https://github.com/Kosmorro/kosmorro/compare/v0.10.2...v0.10.3) (2021-11-01)
# [Version 0.10.3](https://github.com/Kosmorro/kosmorro/compare/v0.10.2...v0.10.3) (2021-11-01)


### Bug Fixes
@@ -43,7 +52,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha
**Note:** if you were using Kosmorro < 0.10.3, files were automatically downloaded. Those files are not necessary anymore, so you can delete the folder `$HOME/.kosmorro-cache`


# [v0.10.2](https://github.com/Kosmorro/kosmorro/compare/v0.10.1...v0.10.2) (2021-08-26)
# [Version 0.10.2](https://github.com/Kosmorro/kosmorro/compare/v0.10.1...v0.10.2) (2021-08-26)


### Bug Fixes
@@ -52,7 +61,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.10.1](https://github.com/Kosmorro/kosmorro/compare/v0.10.0...v0.10.1) (2021-06-20)
# [Version 0.10.1](https://github.com/Kosmorro/kosmorro/compare/v0.10.0...v0.10.1) (2021-06-20)


### Bug Fixes
@@ -62,7 +71,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.10.0](https://github.com/Kosmorro/kosmorro/compare/v0.9.0...v0.10.0) (2021-05-30)
# [Version 0.10.0](https://github.com/Kosmorro/kosmorro/compare/v0.9.0...v0.10.0) (2021-05-30)


### Bug Fixes
@@ -77,7 +86,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.9.0](https://github.com/Kosmorro/kosmorro/compare/v0.8.1...v0.9.0) (2021-01-31)
# [Version 0.9.0](https://github.com/Kosmorro/kosmorro/compare/v0.8.1...v0.9.0) (2021-01-31)


### Code Refactoring
@@ -102,7 +111,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.8.1](https://github.com/Deuchnord/kosmorro/compare/v0.8.0...v0.8.1) (2020-06-07)
# [Version 0.8.1](https://github.com/Deuchnord/kosmorro/compare/v0.8.0...v0.8.1) (2020-06-07)


### Bug Fixes
@@ -112,7 +121,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.8.0](https://github.com/Deuchnord/kosmorro/compare/v0.7.0...v0.8.0) (2020-05-22)
# [Version 0.8.0](https://github.com/Deuchnord/kosmorro/compare/v0.7.0...v0.8.0) (2020-05-22)


### Code Refactoring
@@ -132,7 +141,7 @@ If v0.10.3 does not exist on your distribution, install v0.10.4, and you will ha



# [v0.7.0](https://github.com/Deuchnord/kosmorro/compare/v0.6.2...v0.7.0) (2020-04-05)
# [Version 0.7.0](https://github.com/Deuchnord/kosmorro/compare/v0.6.2...v0.7.0) (2020-04-05)


### Features
@@ -150,7 +159,7 @@ favor of a single one.



# [v0.6.2](https://github.com/Deuchnord/kosmorro/compare/v0.6.1...v0.6.2) (2020-03-19)
# [Version 0.6.2](https://github.com/Deuchnord/kosmorro/compare/v0.6.1...v0.6.2) (2020-03-19)


### Bug Fixes
@@ -159,7 +168,7 @@ favor of a single one.



# [v0.6.1](https://github.com/Deuchnord/kosmorro/compare/v0.6.0...v0.6.1) (2020-03-08)
# [Version 0.6.1](https://github.com/Deuchnord/kosmorro/compare/v0.6.0...v0.6.1) (2020-03-08)


### Bug Fixes
@@ -170,7 +179,7 @@ favor of a single one.



# [v0.6.0](https://github.com/Deuchnord/kosmorro/compare/v0.5.2...v0.6.0) (2020-03-01)
# [Version 0.6.0](https://github.com/Deuchnord/kosmorro/compare/v0.5.2...v0.6.0) (2020-03-01)


### Features
@@ -181,7 +190,7 @@ favor of a single one.



# [v0.5.2](https://github.com/Deuchnord/kosmorro/compare/v0.5.1...v0.5.2) (2020-02-04)
# [Version 0.5.2](https://github.com/Deuchnord/kosmorro/compare/v0.5.1...v0.5.2) (2020-02-04)


### Bug Fixes
@@ -190,7 +199,7 @@ favor of a single one.



# [v0.5.1](https://github.com/Deuchnord/kosmorro/compare/v0.5.0...v0.5.1) (2020-02-03)
# [Version 0.5.1](https://github.com/Deuchnord/kosmorro/compare/v0.5.0...v0.5.1) (2020-02-03)


### Bug Fixes
@@ -199,7 +208,7 @@ favor of a single one.



# [v0.5.0](https://github.com/Deuchnord/kosmorro/compare/v0.4.0...v0.5.0) (2020-01-26)
# [Version 0.5.0](https://github.com/Deuchnord/kosmorro/compare/v0.4.0...v0.5.0) (2020-01-26)


### Features
@@ -210,7 +219,7 @@ favor of a single one.



# [v0.4.0](https://github.com/Deuchnord/kosmorro/compare/v0.3.1...v0.4.0) (2019-12-28)
# [Version 0.4.0](https://github.com/Deuchnord/kosmorro/compare/v0.3.1...v0.4.0) (2019-12-28)


### Features
@@ -230,7 +239,7 @@ eventually, the events for the given date (or today if date not given).



# [v0.3.1](https://github.com/Deuchnord/kosmorro/compare/v0.3.0...v0.3.1) (2019-12-01)
# [Version 0.3.1](https://github.com/Deuchnord/kosmorro/compare/v0.3.0...v0.3.1) (2019-12-01)


### Bug Fixes
@@ -239,7 +248,7 @@ eventually, the events for the given date (or today if date not given).



# [v0.3.0](https://github.com/Deuchnord/kosmorro/compare/v0.2.3...v0.3.0) (2019-12-01)
# [Version 0.3.0](https://github.com/Deuchnord/kosmorro/compare/v0.2.3...v0.3.0) (2019-12-01)


### Bug Fixes
@@ -267,7 +276,7 @@ instead of a string



# [v0.2.3](https://github.com/Deuchnord/kosmorro/compare/v0.2.2...v0.2.3) (2019-11-24)
# [Version 0.2.3](https://github.com/Deuchnord/kosmorro/compare/v0.2.2...v0.2.3) (2019-11-24)


### Bug Fixes
@@ -276,7 +285,7 @@ instead of a string



# [v0.2.2](https://github.com/Deuchnord/kosmorro/compare/v0.2.1...v0.2.2) (2019-11-18)
# [Version 0.2.2](https://github.com/Deuchnord/kosmorro/compare/v0.2.1...v0.2.2) (2019-11-18)


### Bug Fixes
@@ -288,14 +297,14 @@ instead of a string

* add argument to get the current version ([5f74b08](https://github.com/Deuchnord/kosmorro/commit/5f74b08d15bbccededfc5a195b6943c408c93d16))

# [v0.2.1](https://github.com/Deuchnord/kosmorro/compare/v0.2.0...v0.2.1) (2019-11-17)
# [Version 0.2.1](https://github.com/Deuchnord/kosmorro/compare/v0.2.0...v0.2.1) (2019-11-17)


### Bug Fixes

* Move version constant to its own file to prevent sgp4 module failing in the AUR ([9a0c9d3](https://github.com/Deuchnord/kosmorro/commit/9a0c9d3ae34c5fa561b5a1b252d39a5ef2a0a4b9))

# [v0.2.0](https://github.com/Deuchnord/kosmorro/compare/v0.1.0...v0.2.0) (2019-11-17)
# [Version 0.2.0](https://github.com/Deuchnord/kosmorro/compare/v0.1.0...v0.2.0) (2019-11-17)

### Added



+ 9
- 2
Makefile Просмотреть файл

@@ -14,7 +14,7 @@ messages:
pipenv run python setup.py extract_messages --output-file=_kosmorro/locales/messages.pot

i18n:
python3 setup.py compile_catalog
pipenv run python setup.py compile_catalog

changelog:
conventional-changelog -p angular -i CHANGELOG.md -s
@@ -23,5 +23,12 @@ prepare-release: messages changelog
@echo
@echo "Before tagging, don't forget to update version number in CHANGELOG"

appdir:
appimage-builder --skip-tests
mv *.AppImage dist/
mv *.zsync dist/

appimage: appdir

clean:
rm -rf build dist kosmorro.egg-info manpage/kosmorro.{1,7}{,.html}
rm -rf build dist appimage-builder-cache kosmorro.egg-info manpage/kosmorro.{1,7}{,.html}

+ 39
- 53
Pipfile.lock Просмотреть файл

@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "39536a57f16c0054ec8b2958fd3c0f6375098b52f06725f0be374e1f3324c16f"
"sha256": "c1f6551ee33e3015fa1aaa679059da0744c447948707b7e517cce926f336f6f9"
},
"pipfile-spec": 6,
"requires": {
@@ -25,59 +25,45 @@
},
"jplephem": {
"hashes": [
"sha256:abb1dce2f5a2d8862a19866639397b230d0ca114cfcf613b2d4e49eeb5dd71f7"
"sha256:e1c6e5565c4d00485f1063241b4d1eff044585c22b8e97fad0ff2f6efb8aaa27"
],
"version": "==2.16"
"version": "==2.17"
},
"kosmorrolib": {
"hashes": [
"sha256:452870dd793be96ea345482491e28c68516568196956d69a61973d73ba8e2d2b",
"sha256:e3cf3c1dfb4fa36fd9883ca0438d92b05680dd63b2bf2e759153c88a8b26362d"
"sha256:2e87ca964764b710af72ac55aea625869051713938a60177fc62e85ce45acbe9",
"sha256:973b1c51aa652b990ef742220aaca3686f09382b7ff47e186be4039fd9009a32"
],
"index": "pypi",
"version": "==1.0.1"
"version": "==1.0.4"
},
"numpy": {
"hashes": [
"sha256:011e4c430f2e2739e0d182cb7e2b5d47adc46a8db49a788e5798805b7878c4ba",
"sha256:013fa3500a6e5b3ba51401056aa9c41d83a7e737959d15f288d410f26cc33896",
"sha256:0ebb646ef72a2348036ed1692e6bb3f3dd4f8d026681b7168a9ac988d9832c27",
"sha256:21613822dd597d4645c586ac21910fded5344f843410dace91c129a38c31d8be",
"sha256:2242fa31413e40847016234485f228fa5e082b0c555d3db65fe9aa4efcfb8d8d",
"sha256:2934fb435d85341efb40f9db637a203a042300afdaa49f833608df21a5d8ae30",
"sha256:56109e7e9b205439990e90682163d8155cf5743efe65c30221ef3834621ffd3f",
"sha256:5e56515f5abb493bd32d2196ecd3ce794792419adfb7d8b4cccd4ddaf74ab924",
"sha256:6730a1495f1acedd97e82e32cca4d8dbe07b89f01f395ca02ca4a9e110d9519d",
"sha256:6759e6dafd96454be2d6dd80674293322191639400832688cd234c5f483ce1a9",
"sha256:7dbfa0abe053afbcb9e61ec1557556e4e30c3e4b5df4ec7849bf245e8c09feec",
"sha256:8c5016694b9bda77cda32ebfdde34d2246978ed4c49e9baab26bcf38621b7390",
"sha256:91bb1e29d74a90861e878b0c7bc941a1c0ac051cb4b171dc242e66953c95ca1e",
"sha256:a2dd58beb8a8266d704a76692e8eb76ff20f5b2940db7aeee216c2dbf226e5c6",
"sha256:b00d9bf43cc8975cf5e0c211d218e75a3f5ce1ae34dc84d8a489c28a0dba7848",
"sha256:b0ed56b9d7535d654d2a0478333cc08d1b9849767eafd07e1f6a3d8d90a2cad0",
"sha256:bc991b3f8ea7c0f6703df2bc23c098cfe6f1a3a5e8a3a901eb6a5619275d53ff",
"sha256:ccf027e3bbcd06b5c26a0196ddfc24c4d09d2001cc5d38738efff9d9ac8dee58",
"sha256:d0be0eb7df39f0e0732d73250de55e1dcc8086c23db970d5eab85dbf0713502d",
"sha256:e48368972e0999af098e0a6e9a3573895fd4c3b0b2d8c5cf215b17910cd6c124",
"sha256:e981667470ae74f06cfd0d54c5fa9cd88661a27eccaac2cba505039f0b29dc2e",
"sha256:eb6dd744a9f94b424bf70d62b7874798ea95b6b58fb63ec651b69a46872e5bd5"
"sha256:0cfe07133fd00b27edee5e6385e333e9eeb010607e8a46e1cd673f05f8596595",
"sha256:11a1f3816ea82eed4178102c56281782690ab5993251fdfd75039aad4d20385f",
"sha256:2762331de395739c91f1abb88041f94a080cb1143aeec791b3b223976228af3f",
"sha256:283d9de87c0133ef98f93dfc09fad3fb382f2a15580de75c02b5bb36a5a159a5",
"sha256:3d22662b4b10112c545c91a0741f2436f8ca979ab3d69d03d19322aa970f9695",
"sha256:41388e32e40b41dd56eb37fcaa7488b2b47b0adf77c66154d6b89622c110dfe9",
"sha256:42c16cec1c8cf2728f1d539bd55aaa9d6bb48a7de2f41eb944697293ef65a559",
"sha256:47ee7a839f5885bc0c63a74aabb91f6f40d7d7b639253768c4199b37aede7982",
"sha256:5a311ee4d983c487a0ab546708edbdd759393a3dc9cd30305170149fedd23c88",
"sha256:5dc65644f75a4c2970f21394ad8bea1a844104f0fe01f278631be1c7eae27226",
"sha256:6ed0d073a9c54ac40c41a9c2d53fcc3d4d4ed607670b9e7b0de1ba13b4cbfe6f",
"sha256:76ba7c40e80f9dc815c5e896330700fd6e20814e69da9c1267d65a4d051080f1",
"sha256:818b9be7900e8dc23e013a92779135623476f44a0de58b40c32a15368c01d471",
"sha256:a024181d7aef0004d76fb3bce2a4c9f2e67a609a9e2a6ff2571d30e9976aa383",
"sha256:a955e4128ac36797aaffd49ab44ec74a71c11d6938df83b1285492d277db5397",
"sha256:a97a954a8c2f046d3817c2bce16e3c7e9a9c2afffaf0400f5c16df5172a67c9c",
"sha256:a97e82c39d9856fe7d4f9b86d8a1e66eff99cf3a8b7ba48202f659703d27c46f",
"sha256:b55b953a1bdb465f4dc181758570d321db4ac23005f90ffd2b434cc6609a63dd",
"sha256:bb02929b0d6bfab4c48a79bd805bd7419114606947ec8284476167415171f55b",
"sha256:bece0a4a49e60e472a6d1f70ac6cdea00f9ab80ff01132f96bd970cdd8a9e5a9",
"sha256:e41e8951749c4b5c9a2dc5fdbc1a4eec6ab2a140fdae9b460b0f557eed870f4d",
"sha256:f71d57cc8645f14816ae249407d309be250ad8de93ef61d9709b45a0ddf4050c"
],
"markers": "python_version >= '3.8'",
"version": "==1.22.0rc1"
},
"openlocationcode": {
"hashes": [
"sha256:6fc0108a8214b65d74964105bd69645a8a7529237f0de6aadcfa83cc3373b359"
],
"index": "pypi",
"version": "==1.0.1"
},
"openlocationcode": {
"hashes": [
"sha256:6fc0108a8214b65d74964105bd69645a8a7529237f0de6aadcfa83cc3373b359"
],
"index": "pypi",
"version": "==1.0.1"
"version": "==1.22.0"
},
"python-dateutil": {
"hashes": [
@@ -131,9 +117,9 @@
},
"skyfield": {
"hashes": [
"sha256:23077a1dddd60004a17067e0d1b0164b38268bc3bff78c2a3dca309e91ca39c2"
"sha256:3cbc6a053183973be87cfbb5959cc76e2dbd9ecce5e23658bb60abee3ed5b4b0"
],
"version": "==1.40"
"version": "==1.41"
},
"skyfield-data": {
"hashes": [
@@ -200,11 +186,11 @@
},
"platformdirs": {
"hashes": [
"sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2",
"sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"
"sha256:1d7385c7db91728b83efd0ca99a5afb296cab9d0ed8313a45ed8ba17967ecfca",
"sha256:440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda"
],
"markers": "python_version >= '3.6'",
"version": "==2.4.0"
"markers": "python_version >= '3.7'",
"version": "==2.4.1"
},
"pytz": {
"hashes": [
@@ -215,18 +201,18 @@
},
"tomli": {
"hashes": [
"sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee",
"sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"
"sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f",
"sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"
],
"markers": "python_version >= '3.6'",
"version": "==1.2.2"
"version": "==1.2.3"
},
"typing-extensions": {
"hashes": [
"sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e",
"sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"
],
"markers": "python_version >= '3.6'",
"markers": "python_version >= '3.10'",
"version": "==4.0.1"
}
}


+ 1
- 1
_kosmorro/__version__.py Просмотреть файл

@@ -19,7 +19,7 @@
__title__ = "kosmorro"
__description__ = "A program that computes your ephemerides"
__url__ = "https://kosmorro.space"
__version__ = "0.10.7"
__version__ = "0.10.8"
__author__ = "Jérôme Deuchnord"
__author_email__ = "jerome@deuchnord.fr"
__license__ = "AGPL"


+ 42
- 53
_kosmorro/locales/messages.pot Просмотреть файл

@@ -1,14 +1,14 @@
# Translations template for kosmorro.
# Copyright (C) 2021 ORGANIZATION
# Copyright (C) 2022 ORGANIZATION
# This file is distributed under the same license as the kosmorro project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: kosmorro 0.10.7\n"
"Project-Id-Version: kosmorro 0.10.8\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-12-09 19:51+0100\n"
"POT-Creation-Date: 2022-01-10 09:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,19 +39,19 @@ msgstr ""
msgid "Note: All the hours are given in the UTC{offset} timezone."
msgstr ""

#: _kosmorro/dumper.py:202 _kosmorro/dumper.py:341
#: _kosmorro/dumper.py:202 _kosmorro/dumper.py:335
msgid "Object"
msgstr ""

#: _kosmorro/dumper.py:203 _kosmorro/dumper.py:342
#: _kosmorro/dumper.py:203 _kosmorro/dumper.py:336
msgid "Rise time"
msgstr ""

#: _kosmorro/dumper.py:204 _kosmorro/dumper.py:344
#: _kosmorro/dumper.py:204 _kosmorro/dumper.py:338
msgid "Culmination time"
msgstr ""

#: _kosmorro/dumper.py:205 _kosmorro/dumper.py:346
#: _kosmorro/dumper.py:205 _kosmorro/dumper.py:340
msgid "Set time"
msgstr ""

@@ -59,7 +59,7 @@ msgstr ""
msgid "Moon phase is unavailable for this date."
msgstr ""

#: _kosmorro/dumper.py:240 _kosmorro/dumper.py:350
#: _kosmorro/dumper.py:240 _kosmorro/dumper.py:344
msgid "Moon phase:"
msgstr ""

@@ -67,36 +67,36 @@ msgstr ""
msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}"
msgstr ""

#: _kosmorro/dumper.py:314
#: _kosmorro/dumper.py:308
msgid "Overview of your sky"
msgstr ""

#: _kosmorro/dumper.py:322
#: _kosmorro/dumper.py:316
msgid ""
"This document summarizes the ephemerides and the events of {date}. It "
"aims to help you to prepare your observation session. All the hours are "
"given in {timezone}."
msgstr ""

#: _kosmorro/dumper.py:332
#: _kosmorro/dumper.py:326
msgid ""
"Don't forget to check the weather forecast before you go out with your "
"equipment."
msgstr ""

#: _kosmorro/dumper.py:339
#: _kosmorro/dumper.py:333
msgid "Ephemerides of the day"
msgstr ""

#: _kosmorro/dumper.py:348
#: _kosmorro/dumper.py:342
msgid "hours"
msgstr ""

#: _kosmorro/dumper.py:355
#: _kosmorro/dumper.py:349
msgid "Expected events"
msgstr ""

#: _kosmorro/dumper.py:509
#: _kosmorro/dumper.py:503
msgid ""
"Building PDF was not possible, because some dependencies are not "
"installed.\n"
@@ -104,7 +104,7 @@ msgid ""
"pdf/ for more information."
msgstr ""

#: _kosmorro/dumper.py:558
#: _kosmorro/dumper.py:556
#, python-format
msgid ""
"An error occurred during the compilation of the PDF.\n"
@@ -116,109 +116,98 @@ msgstr ""
msgid "The date must be between {minimum_date} and {maximum_date}"
msgstr ""

#: _kosmorro/exceptions.py:47
msgid ""
"Invalid output format: {output_format}. Output file must end with: "
"{accepted_extensions}"
msgstr ""

#: _kosmorro/geolocation.py:14
#, python-format
msgid "The given position (%s) is not valid."
msgstr ""

#: _kosmorro/geolocation.py:29
msgid "The given Plus Code seems to be a short code, please provide a full code."
msgstr ""

#: _kosmorro/main.py:77
#: _kosmorro/main.py:60
msgid ""
"Save the planet and paper!\n"
"Consider printing your PDF document only if really necessary, and use the"
" other side of the sheet."
msgstr ""

#: _kosmorro/main.py:86
#: _kosmorro/main.py:69
msgid ""
"PDF output will not contain the ephemerides, because you didn't provide "
"the observation coordinates."
msgstr ""

#: _kosmorro/main.py:138
#: _kosmorro/main.py:114
msgid "The file could not be saved in \"{path}\": {error}"
msgstr ""

#: _kosmorro/main.py:152
#: _kosmorro/main.py:128
msgid "Please provide a file path to export in this format (--output)."
msgstr ""

#: _kosmorro/main.py:185
#: _kosmorro/main.py:161
msgid "Moon phase can only be displayed between {min_date} and {max_date}"
msgstr ""

#: _kosmorro/main.py:235
#: _kosmorro/main.py:200
msgid "Running on Python {python_version} with Kosmorrolib v{kosmorrolib_version}"
msgstr ""

#: _kosmorro/main.py:248
#: _kosmorro/main.py:213
msgid ""
"Compute the ephemerides and the events for a given date and a given "
"position on Earth."
msgstr ""

#: _kosmorro/main.py:251
#: _kosmorro/main.py:216
msgid ""
"By default, only the events will be computed for today ({date}).\n"
"To compute also the ephemerides, latitude and longitude arguments are "
"needed."
msgstr ""

#: _kosmorro/main.py:265
#: _kosmorro/main.py:230
msgid "Show the program version"
msgstr ""

#: _kosmorro/main.py:273
#: _kosmorro/main.py:238
msgid "The format to output the information to"
msgstr ""

#: _kosmorro/main.py:245
msgid ""
"The format to output the information to. If not provided, the output "
"format will be inferred from the file extension of the output file."
"The observer's latitude on Earth. Can also be set in the "
"KOSMORRO_LATITUDE environment variable."
msgstr ""

#: _kosmorro/main.py:283
#: _kosmorro/main.py:255
msgid ""
"The observer's position on Earth, in the \"{latitude},{longitude}\" "
"format.Can also be set in the KOSMORRO_POSITION environment variable."
"The observer's longitude on Earth. Can also be set in the "
"KOSMORRO_LONGITUDE environment variable."
msgstr ""

#: _kosmorro/main.py:293
#: _kosmorro/main.py:265
msgid ""
"The date for which the ephemerides must be calculated. Can be in the "
"YYYY-MM-DD format or an interval in the \"[+-]YyMmDd\" format (with Y, M,"
" and D numbers). Defaults to today ({default_date})."
msgstr ""

#: _kosmorro/main.py:304
#: _kosmorro/main.py:276
msgid ""
"The timezone to display the hours in (e.g. 2 for UTC+2 or -3 for UTC-3). "
"Can also be set in the KOSMORRO_TIMEZONE environment variable."
msgstr ""

#: _kosmorro/main.py:313
#: _kosmorro/main.py:285
msgid "Disable the colors in the console."
msgstr ""

#: _kosmorro/main.py:320
#: _kosmorro/main.py:292
msgid ""
"A file to export the output to. If not given, the standard output is "
"used. This argument is needed for PDF format."
msgstr ""

#: _kosmorro/main.py:329
#: _kosmorro/main.py:301
msgid ""
"Do not generate a graph to represent the rise and set times in the PDF "
"format."
msgstr ""

#: _kosmorro/main.py:337
#: _kosmorro/main.py:309
msgid "Show debugging messages"
msgstr ""



+ 0
- 2
_kosmorro/main.py Просмотреть файл

@@ -17,8 +17,6 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import argparse
import locale
import re
import sys
import os.path



+ 0
- 3
kosmorro Просмотреть файл

@@ -17,11 +17,8 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import sys
import locale
from _kosmorro.main import main

locale.setlocale(locale.LC_ALL, "")

if __name__ == "__main__":
try:
sys.exit(main())


Загрузка…
Отмена
Сохранить