Skip to content

Commit 0777e7c

Browse files
serhii73serhii73
authored
Merge branch 'master' into issue/912-rel-dates-err-ind
2 parents 6a74fe6 + bcd1a3c commit 0777e7c

155 files changed

Lines changed: 4715 additions & 3699 deletions

Some content is hidden

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

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
env:
4040
TOXENV: latest
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
4343
- name: 'Set up Python ${{ matrix.python-version }}'
44-
uses: actions/setup-python@v2
44+
uses: actions/setup-python@v4
4545
with:
4646
python-version: '${{ matrix.python-version }}'
4747
- name: Install language-pack-fr
@@ -52,4 +52,4 @@ jobs:
5252
run: tox -e py
5353
- name: Upload coverage.xml to codecov
5454
if: ${{ matrix.python-version == '3.9' && matrix.env.TOXENV == 'latest'}}
55-
uses: codecov/codecov-action@v1
55+
uses: codecov/codecov-action@v3

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- name: Set up Python
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v4
1515
with:
1616
python-version: "3.x"
1717
- name: Install dependencies

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.py[cod]
2+
.python-version
23

34
# C extensions
45
*.so
@@ -47,6 +48,7 @@ docs/_build
4748
# Editors
4849
*.swp
4950
.idea
51+
.vscode/
5052

5153
# Other
5254
raw_data

‎HISTORY.rst‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@
33
History
44
=======
55

6+
1.1.2 (2022-10-20)
7+
------------------
8+
9+
Improvements:
10+
11+
- Added support for negative timestamp (#1060)
12+
- Fixed PytzUsageWarning for Python versions >= 3.6 (#1062)
13+
- Added support for dates with dots and spaces (#1028)
14+
- Improved support for Ukrainian, Croatian and Russian (#1072, #1074, #1079, #1082, #1073, #1083)
15+
- Added support for parsing Unix timestamps consistently regardless of timezones (#954)
16+
- Improved tests (#1086)
17+
18+
19+
1.1.1 (2022-03-17)
20+
------------------
21+
22+
Improvements:
23+
24+
- Fixed issue with regex library by pinning dependencies to an earlier version (< 2022.3.15, #1046).
25+
- Extended support for Russian language dates starting with lowercase (#999).
26+
- Allowed to use_given_order for languages too (#997).
27+
- Fixed link to settings section (#1018).
28+
- Defined UTF-8 encoding for Windows (#998).
29+
- Fixed directories creation error in CLI utils (#1022).
30+
31+
632
1.1.0 (2021-10-04)
733
------------------
834

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ You can control multiple behaviors by using the ``settings`` parameter:
133133
datetime.datetime(1992, 1, 2, 0, 0)
134134
135135
To see more examples on how to use the ``settings``, check the `settings
136-
section <https://dateparser.readthedocs.io/en/latest/usage.html#settings>`__
136+
section <https://dateparser.readthedocs.io/en/latest/settings.html>`__
137137
in the docs.
138138

139139
False positives

‎dateparser/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '1.1.0'
1+
__version__ = '1.1.2'
22

33
from .date import DateDataParser
44
from .conf import apply_settings

‎dateparser/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def _check_require_part(setting_name, setting_value):
120120
def _check_parsers(setting_name, setting_value):
121121
"""Returns `True` if the provided list of parsers contains valid values"""
122122
existing_parsers = [
123-
'timestamp', 'relative-time', 'custom-formats', 'absolute-time', 'no-spaces-time'
123+
'timestamp', 'relative-time', 'custom-formats', 'absolute-time', 'no-spaces-time', 'negative-timestamp'
124124
] # FIXME: Extract the list of existing parsers from another place (#798)
125125
unknown_parsers = set(setting_value) - set(existing_parsers)
126126
if unknown_parsers:

‎dateparser/data/date_translation_data/af.py‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -161,63 +161,63 @@
161161
},
162162
"relative-type-regex": {
163163
"\\1 day ago": [
164-
"(\\d+) dae gelede",
165-
"(\\d+) dag gelede"
164+
"(\\d+[.,]?\\d*) dae gelede",
165+
"(\\d+[.,]?\\d*) dag gelede"
166166
],
167167
"\\1 hour ago": [
168-
"(\\d+) uur gelede"
168+
"(\\d+[.,]?\\d*) uur gelede"
169169
],
170170
"\\1 minute ago": [
171-
"(\\d+) min gelede",
172-
"(\\d+) minute gelede",
173-
"(\\d+) minuut gelede"
171+
"(\\d+[.,]?\\d*) min gelede",
172+
"(\\d+[.,]?\\d*) minute gelede",
173+
"(\\d+[.,]?\\d*) minuut gelede"
174174
],
175175
"\\1 month ago": [
176-
"(\\d+) maand gelede",
177-
"(\\d+) maande gelede",
178-
"(\\d+) md gelede"
176+
"(\\d+[.,]?\\d*) maand gelede",
177+
"(\\d+[.,]?\\d*) maande gelede",
178+
"(\\d+[.,]?\\d*) md gelede"
179179
],
180180
"\\1 second ago": [
181-
"(\\d+) sek gelede",
182-
"(\\d+) sekonde gelede",
183-
"(\\d+) sekondes gelede"
181+
"(\\d+[.,]?\\d*) sek gelede",
182+
"(\\d+[.,]?\\d*) sekonde gelede",
183+
"(\\d+[.,]?\\d*) sekondes gelede"
184184
],
185185
"\\1 week ago": [
186-
"(\\d+) w gelede",
187-
"(\\d+) week gelede",
188-
"(\\d+) weke gelede"
186+
"(\\d+[.,]?\\d*) w gelede",
187+
"(\\d+[.,]?\\d*) week gelede",
188+
"(\\d+[.,]?\\d*) weke gelede"
189189
],
190190
"\\1 year ago": [
191-
"(\\d+) jaar gelede"
191+
"(\\d+[.,]?\\d*) jaar gelede"
192192
],
193193
"in \\1 day": [
194-
"oor (\\d+) dae",
195-
"oor (\\d+) dag",
196-
"oor (\\d+) minuut"
194+
"oor (\\d+[.,]?\\d*) dae",
195+
"oor (\\d+[.,]?\\d*) dag",
196+
"oor (\\d+[.,]?\\d*) minuut"
197197
],
198198
"in \\1 hour": [
199-
"oor (\\d+) uur"
199+
"oor (\\d+[.,]?\\d*) uur"
200200
],
201201
"in \\1 minute": [
202-
"oor (\\d+) min",
203-
"oor (\\d+) minuut"
202+
"oor (\\d+[.,]?\\d*) min",
203+
"oor (\\d+[.,]?\\d*) minuut"
204204
],
205205
"in \\1 month": [
206-
"oor (\\d+) md",
207-
"oor (\\d+) minuut"
206+
"oor (\\d+[.,]?\\d*) md",
207+
"oor (\\d+[.,]?\\d*) minuut"
208208
],
209209
"in \\1 second": [
210-
"oor (\\d+) sek",
211-
"oor (\\d+) sekonde",
212-
"oor (\\d+) sekondes"
210+
"oor (\\d+[.,]?\\d*) sek",
211+
"oor (\\d+[.,]?\\d*) sekonde",
212+
"oor (\\d+[.,]?\\d*) sekondes"
213213
],
214214
"in \\1 week": [
215-
"oor (\\d+) w",
216-
"oor (\\d+) week",
217-
"oor (\\d+) weke"
215+
"oor (\\d+[.,]?\\d*) w",
216+
"oor (\\d+[.,]?\\d*) week",
217+
"oor (\\d+[.,]?\\d*) weke"
218218
],
219219
"in \\1 year": [
220-
"oor (\\d+) jaar"
220+
"oor (\\d+[.,]?\\d*) jaar"
221221
]
222222
},
223223
"locale_specific": {

‎dateparser/data/date_translation_data/am.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -146,62 +146,62 @@
146146
},
147147
"relative-type-regex": {
148148
"\\1 day ago": [
149-
"ከ (\\d+) ቀን በፊት",
150-
"ከ(\\d+) ቀናት በፊት",
151-
"ከ(\\d+) ቀን በፊት",
152-
"ከ(\\d+) ቀኖች በፊት"
149+
"ከ (\\d+[.,]?\\d*) ቀን በፊት",
150+
"ከ(\\d+[.,]?\\d*) ቀናት በፊት",
151+
"ከ(\\d+[.,]?\\d*) ቀን በፊት",
152+
"ከ(\\d+[.,]?\\d*) ቀኖች በፊት"
153153
],
154154
"\\1 hour ago": [
155-
"ከ(\\d+) ሰዓት በፊት",
156-
"ከ(\\d+) ሰዓቶች በፊት"
155+
"ከ(\\d+[.,]?\\d*) ሰዓት በፊት",
156+
"ከ(\\d+[.,]?\\d*) ሰዓቶች በፊት"
157157
],
158158
"\\1 minute ago": [
159-
"ከ(\\d+) ደቂቃ በፊት",
160-
"ከ(\\d+) ደቂቃዎች በፊት"
159+
"ከ(\\d+[.,]?\\d*) ደቂቃ በፊት",
160+
"ከ(\\d+[.,]?\\d*) ደቂቃዎች በፊት"
161161
],
162162
"\\1 month ago": [
163-
"ከ(\\d+) ወራት በፊት",
164-
"ከ(\\d+) ወር በፊት"
163+
"ከ(\\d+[.,]?\\d*) ወራት በፊት",
164+
"ከ(\\d+[.,]?\\d*) ወር በፊት"
165165
],
166166
"\\1 second ago": [
167-
"ከ(\\d+) ሰከንድ በፊት",
168-
"ከ(\\d+) ሰከንዶች በፊት"
167+
"ከ(\\d+[.,]?\\d*) ሰከንድ በፊት",
168+
"ከ(\\d+[.,]?\\d*) ሰከንዶች በፊት"
169169
],
170170
"\\1 week ago": [
171-
"ከ(\\d+) ሳምንታት በፊት",
172-
"ከ(\\d+) ሳምንት በፊት"
171+
"ከ(\\d+[.,]?\\d*) ሳምንታት በፊት",
172+
"ከ(\\d+[.,]?\\d*) ሳምንት በፊት"
173173
],
174174
"\\1 year ago": [
175-
"ከ(\\d+) ዓመታት በፊት",
176-
"ከ(\\d+) ዓመት በፊት"
175+
"ከ(\\d+[.,]?\\d*) ዓመታት በፊት",
176+
"ከ(\\d+[.,]?\\d*) ዓመት በፊት"
177177
],
178178
"in \\1 day": [
179-
"በ(\\d+) ቀናት ውስጥ",
180-
"በ(\\d+) ቀን ውስጥ",
181-
"በ(\\d+) ቀኖች ውስጥ"
179+
"በ(\\d+[.,]?\\d*) ቀናት ውስጥ",
180+
"በ(\\d+[.,]?\\d*) ቀን ውስጥ",
181+
"በ(\\d+[.,]?\\d*) ቀኖች ውስጥ"
182182
],
183183
"in \\1 hour": [
184-
"በ(\\d+) ሰዓት ውስጥ",
185-
"በ(\\d+) ሰዓቶች ውስጥ"
184+
"በ(\\d+[.,]?\\d*) ሰዓት ውስጥ",
185+
"በ(\\d+[.,]?\\d*) ሰዓቶች ውስጥ"
186186
],
187187
"in \\1 minute": [
188-
"በ(\\d+) ደቂቃ ውስጥ",
189-
"በ(\\d+) ደቂቃዎች ውስጥ"
188+
"በ(\\d+[.,]?\\d*) ደቂቃ ውስጥ",
189+
"በ(\\d+[.,]?\\d*) ደቂቃዎች ውስጥ"
190190
],
191191
"in \\1 month": [
192-
"በ(\\d+) ወራት ውስጥ",
193-
"በ(\\d+) ወር ውስጥ"
192+
"በ(\\d+[.,]?\\d*) ወራት ውስጥ",
193+
"በ(\\d+[.,]?\\d*) ወር ውስጥ"
194194
],
195195
"in \\1 second": [
196-
"በ(\\d+) ሰከንድ ውስጥ",
197-
"በ(\\d+) ሰከንዶች ውስጥ"
196+
"በ(\\d+[.,]?\\d*) ሰከንድ ውስጥ",
197+
"በ(\\d+[.,]?\\d*) ሰከንዶች ውስጥ"
198198
],
199199
"in \\1 week": [
200-
"በ(\\d+) ሳምንታት ውስጥ",
201-
"በ(\\d+) ሳምንት ውስጥ"
200+
"በ(\\d+[.,]?\\d*) ሳምንታት ውስጥ",
201+
"በ(\\d+[.,]?\\d*) ሳምንት ውስጥ"
202202
],
203203
"in \\1 year": [
204-
"በ(\\d+) ዓመታት ውስጥ"
204+
"በ(\\d+[.,]?\\d*) ዓመታት ውስጥ"
205205
]
206206
},
207207
"locale_specific": {},

‎dateparser/data/date_translation_data/ar.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,46 +159,46 @@
159159
},
160160
"relative-type-regex": {
161161
"\\1 day ago": [
162-
"قبل (\\d+) يوم"
162+
"قبل (\\d+[.,]?\\d*) يوم"
163163
],
164164
"\\1 hour ago": [
165-
"قبل (\\d+) ساعة"
165+
"قبل (\\d+[.,]?\\d*) ساعة"
166166
],
167167
"\\1 minute ago": [
168-
"قبل (\\d+) دقيقة"
168+
"قبل (\\d+[.,]?\\d*) دقيقة"
169169
],
170170
"\\1 month ago": [
171-
"قبل (\\d+) شهر"
171+
"قبل (\\d+[.,]?\\d*) شهر"
172172
],
173173
"\\1 second ago": [
174-
"قبل (\\d+) ثانية"
174+
"قبل (\\d+[.,]?\\d*) ثانية"
175175
],
176176
"\\1 week ago": [
177-
"قبل (\\d+) أسبوع"
177+
"قبل (\\d+[.,]?\\d*) أسبوع"
178178
],
179179
"\\1 year ago": [
180-
"قبل (\\d+) سنة"
180+
"قبل (\\d+[.,]?\\d*) سنة"
181181
],
182182
"in \\1 day": [
183-
"خلال (\\d+) يوم"
183+
"خلال (\\d+[.,]?\\d*) يوم"
184184
],
185185
"in \\1 hour": [
186-
"خلال (\\d+) ساعة"
186+
"خلال (\\d+[.,]?\\d*) ساعة"
187187
],
188188
"in \\1 minute": [
189-
"خلال (\\d+) دقيقة"
189+
"خلال (\\d+[.,]?\\d*) دقيقة"
190190
],
191191
"in \\1 month": [
192-
"خلال (\\d+) شهر"
192+
"خلال (\\d+[.,]?\\d*) شهر"
193193
],
194194
"in \\1 second": [
195-
"خلال (\\d+) ثانية"
195+
"خلال (\\d+[.,]?\\d*) ثانية"
196196
],
197197
"in \\1 week": [
198-
"خلال (\\d+) أسبوع"
198+
"خلال (\\d+[.,]?\\d*) أسبوع"
199199
],
200200
"in \\1 year": [
201-
"خلال (\\d+) سنة"
201+
"خلال (\\d+[.,]?\\d*) سنة"
202202
]
203203
},
204204
"locale_specific": {

0 commit comments

Comments
 (0)