Merge branch 'master' into 356-altendky-nth_of_month_outside_scope

Author: altendky

.travis.yml

@@ -66,7 +66,8 @@ install:
         source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
       fi
   - pip install pip -U
-  - curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+  - curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
+  - python get-poetry.py --preview -y
   - source $HOME/.poetry/env
   - poetry install -v
   - poetry build -v

CHANGELOG.md

@@ -1,10 +1,16 @@
 # Change Log
 
-## [Unreleased]
+## [2.0.5] - 2019-07-03
 
 ### Fixed
 
-- Fixed ISO week dates not being parsed properly in `fom_format()`.
+- Fixed ISO week dates not being parsed properly in `from_format()`.
+- Fixed loading of some timezones with empty posix spec.
+- Fixed deprecation warnings.
+
+### Locales
+
+- Added RU locale.
 
 
 ## [2.0.4] - 2018-10-30
@@ -87,7 +93,8 @@
 
 
 
-[Unreleased]: https://github.com/sdispater/pendulum/compare/2.0.4...master
+[Unreleased]: https://github.com/sdispater/pendulum/compare/2.0.5...master
+[2.0.5]: https://github.com/sdispater/pendulum/releases/tag/2.0.5
 [2.0.4]: https://github.com/sdispater/pendulum/releases/tag/2.0.4
 [2.0.3]: https://github.com/sdispater/pendulum/releases/tag/2.0.3
 [2.0.2]: https://github.com/sdispater/pendulum/releases/tag/2.0.2

README.rst

@@ -203,7 +203,7 @@ If the locale does not exist you will need to create it by using the ``clock`` u
 
 .. code-block:: bash
 
-    ./clock locale:create <your-locale>
+    ./clock locale create <your-locale>
 
 It will generate a directory in ``pendulum/locales`` named after your locale, with the following
 structure:

appveyor.yml

@@ -20,7 +20,7 @@ install:
   - "python -m pip install --disable-pip-version-check --user --upgrade pip"
 
   # Downloading and installing poetry
-  - python -m pip install poetry -U
+  - python -m pip install poetry>=1.0.0b1 -U
 
   # Install dependencies
   - python -m pip install codecov

clock

@@ -17,6 +17,7 @@ from babel.dates import tokenize_pattern, PATTERN_CHARS
 from babel.localedata import load, normalize_locale, LocaleDataDict
 
 from cleo import Application, Command
+from cleo import argument
 from pendulum import __version__
 
 
@@ -43,12 +44,11 @@ class _LambdaCompiler(_GettextCompiler):
 
 
 class LocaleCreate(Command):
-    """
-    Creates locale translations.
 
-    locale:create
-        {locales?* : Locales to dump}
-    """
+    name = "create"
+    description = "Creates locale translations."
+
+    arguments = [argument("locales", "Locales to dump.", optional=False, multiple=True)]
 
     TEMPLATE = """# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
@@ -93,7 +93,7 @@ translations = {{}}
 
             normalized = normalize_locale(locale.replace("-", "_"))
             if not normalized:
-                self.error("Locale [{}] does not exist.".format(locale))
+                self.line("<error>Locale [{}] does not exist.</error>".format(locale))
                 continue
 
             self.line("<info>Generating <comment>{}</> locale.</>".format(locale))
@@ -229,11 +229,9 @@ translations = {{}}
 
 
 class LocaleRecreate(Command):
-    """
-    Recreate existing locales.
 
-    locale:recreate
-    """
+    name = "recreate"
+    description = "Recreate existing locales."
 
     def handle(self):
         # Listing locales
@@ -245,12 +243,21 @@ class LocaleRecreate(Command):
         self.call("locale:create", [("locales", locales)])
 
 
+class LocaleCommand(Command):
+
+    name = "locale"
+    description = "Locale related commands."
+
+    commands = [LocaleCreate()]
+
+    def handle(self):
+        self.call("help", self._config.name)
+
+
 class WindowsTzDump(Command):
-    """
-    Dumps the mapping of Windows timezones to IANA timezones.
 
-    windows:tz:dump
-    """
+    name = "dump-timezones"
+    description = "Dumps the mapping of Windows timezones to IANA timezones."
 
     MAPPING_DIR = os.path.join("pendulum", "tz", "data")
 
@@ -269,10 +276,20 @@ class WindowsTzDump(Command):
             f.write(mapping)
 
 
-app = Application("Clock", __version__)
-app.add(LocaleCreate())
-app.add(LocaleRecreate())
-app.add(WindowsTzDump())
+class WindowsCommand(Command):
+
+    name = "windows"
+    description = "Windows related commands."
+
+    commands = [WindowsTzDump()]
+
+    def handle(self):
+        self.call("help", self._config.name)
+
+
+app = Application("clock", __version__)
+app.add(LocaleCommand())
+app.add(WindowsCommand())
 
 
 if __name__ == "__main__":

pendulum/__version__.py

@@ -1 +1 @@
-__version__ = "2.0.4"
+__version__ = "2.0.5"

pendulum/formatting/formatter.py

@@ -25,8 +25,8 @@
 _MATCH_5_TO_6 = "\d{5}\d?"
 _MATCH_UNSIGNED = "\d+"
 _MATCH_SIGNED = "[+-]?\d+"
-_MATCH_OFFSET = "(?i)Z|[+-]\d\d:?\d\d"
-_MATCH_SHORT_OFFSET = "(?i)Z|[+-]\d\d(?::?\d\d)?"
+_MATCH_OFFSET = "[Zz]|[+-]\d\d:?\d\d"
+_MATCH_SHORT_OFFSET = "[Zz]|[+-]\d\d(?::?\d\d)?"
 _MATCH_TIMESTAMP = "[+-]?\d+(\.\d{1,6})?"
 _MATCH_WORD = (
     "(?i)[0-9]*"
@@ -403,7 +403,7 @@ def parse(
             lambda m: self._replace_tokens(m.group(0), locale), escaped_fmt
         )
 
-        if not re.match(pattern, time):
+        if not re.search("^" + pattern + "$", time):
             raise ValueError("String does not match format {}".format(fmt))
 
         re.sub(pattern, lambda m: self._get_parsed_values(m, parsed, locale, now), time)

pendulum/locales/id/__init__.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+"""
+id custom locale file.
+"""
+
+translations = {
+    "units": {"few_second": "beberapa detik"},
+    "ago": "{} yang lalu",
+    "from_now": "dalam {}",
+    "after": "{0} kemudian",
+    "before": "{0} yang lalu",
+    "date_formats": {
+        "LTS": "HH:mm:ss",
+        "LT": "HH:mm",
+        "LLLL": "dddd [d.] D. MMMM YYYY HH:mm",
+        "LLL": "D. MMMM YYYY HH:mm",
+        "LL": "D. MMMM YYYY",
+        "L": "DD/MM/YYYY",
+    },
+}

pendulum/locales/id/custom.py

@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+"""
+id locale file.
+
+It has been generated automatically and must not be modified directly.
+"""
+
+from .custom import translations as custom_translations
+
+
+locale = {
+    "plural": lambda n: "other",
+    "ordinal": lambda n: "other",
+    "translations": {
+        "days": {
+            "abbreviated": {
+                0: "Min",
+                1: "Sen",
+                2: "Sel",
+                3: "Rab",
+                4: "Kam",
+                5: "Jum",
+                6: "Sab",
+            },
+            "narrow": {0: "M", 1: "S", 2: "S", 3: "R", 4: "K", 5: "J", 6: "S"},
+            "short": {
+                0: "Min",
+                1: "Sen",
+                2: "Sel",
+                3: "Rab",
+                4: "Kam",
+                5: "Jum",
+                6: "Sab",
+            },
+            "wide": {
+                0: "Minggu",
+                1: "Senin",
+                2: "Selasa",
+                3: "Rabu",
+                4: "Kamis",
+                5: "Jumat",
+                6: "Sabtu",
+            },
+        },
+        "months": {
+            "abbreviated": {
+                1: "Jan",
+                2: "Feb",
+                3: "Mar",
+                4: "Apr",
+                5: "Mei",
+                6: "Jun",
+                7: "Jul",
+                8: "Agt",
+                9: "Sep",
+                10: "Okt",
+                11: "Nov",
+                12: "Des",
+            },
+            "narrow": {
+                1: "J",
+                2: "F",
+                3: "M",
+                4: "A",
+                5: "M",
+                6: "J",
+                7: "J",
+                8: "A",
+                9: "S",
+                10: "O",
+                11: "N",
+                12: "D",
+            },
+            "wide": {
+                1: "Januari",
+                2: "Februari",
+                3: "Maret",
+                4: "April",
+                5: "Mei",
+                6: "Juni",
+                7: "Juli",
+                8: "Agustus",
+                9: "September",
+                10: "Oktober",
+                11: "November",
+                12: "Desember",
+            },
+        },
+        "units": {
+            "year": {"other": "{0} tahun"},
+            "month": {"other": "{0} bulan"},
+            "week": {"other": "{0} minggu"},
+            "day": {"other": "{0} hari"},
+            "hour": {"other": "{0} jam"},
+            "minute": {"other": "{0} menit"},
+            "second": {"other": "{0} detik"},
+            "microsecond": {"other": "{0} mikrodetik"},
+        },
+        "relative": {
+            "year": {
+                "future": {"other": "dalam {0} tahun"},
+                "past": {"other": "{0} tahun yang lalu"},
+            },
+            "month": {
+                "future": {"other": "dalam {0} bulan"},
+                "past": {"other": "{0} bulan yang lalu"},
+            },
+            "week": {
+                "future": {"other": "dalam {0} minggu"},
+                "past": {"other": "{0} minggu yang lalu"},
+            },
+            "day": {
+                "future": {"other": "dalam {0} hari"},
+                "past": {"other": "{0} hari yang lalu"},
+            },
+            "hour": {
+                "future": {"other": "dalam {0} jam"},
+                "past": {"other": "{0} jam yang lalu"},
+            },
+            "minute": {
+                "future": {"other": "dalam {0} menit"},
+                "past": {"other": "{0} menit yang lalu"},
+            },
+            "second": {
+                "future": {"other": "dalam {0} detik"},
+                "past": {"other": "{0} detik yang lalu"},
+            },
+        },
+        "day_periods": {
+            "midnight": "tengah malam",
+            "am": "AM",
+            "noon": "tengah hari",
+            "pm": "PM",
+            "morning1": "pagi",
+            "afternoon1": "siang",
+            "evening1": "sore",
+            "night1": "malam",
+        },
+    },
+    "custom": custom_translations,
+}