datamarket 0.8.3__py3-none-any.whl → 0.8.5__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of datamarket might be problematic. Click here for more details.

Files changed (6) hide show
  1. datamarket/interfaces/nominatim.py +1 -1
  2. datamarket/utils/main.py +9 -8
  3. {datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/METADATA +1 -1
  4. {datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/RECORD +6 -6
  5. {datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/LICENSE +0 -0
  6. {datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/WHEEL +0 -0
datamarket/interfaces/nominatim.py CHANGED
@@ -51,7 +51,7 @@ class Nominatim:
51
51
  return raw_json[key]
52
52
 
53
53
  def geocode(self, address):
54
- return requests.get(f"{self.endpoint}/?q={address}&format=json").json()
54
+ return requests.get(f"{self.endpoint}/search?q={address}&format=json").json()
55
55
 
56
56
  def geocode_parsed(self, address):
57
57
  results = self.geocode(address)
datamarket/utils/main.py CHANGED
@@ -46,6 +46,7 @@ def get_granular_date(
46
46
  "biweekly": "0 0 1,15 * *",
47
47
  "weekly": "0 0 * * MON",
48
48
  "daily": "0 0 * * *",
49
+ "now": "* * * * *",
49
50
  }
50
51
 
51
52
  cron_pattern = predefined_patterns.get(granularity, granularity)
@@ -70,7 +71,7 @@ def get_config(config_file: Path, tz: str = "Europe/Madrid"):
70
71
 
71
72
  add_converter("read", read_converter)
72
73
 
73
- today = get_granular_date("daily", tz)
74
+ dt_now = get_granular_date("now", tz)
74
75
 
75
76
  config = Dynaconf(
76
77
  environments=True,
@@ -81,14 +82,14 @@ def get_config(config_file: Path, tz: str = "Europe/Madrid"):
81
82
  config.load_file(path=Path.home() / config_file.name)
82
83
 
83
84
  config.vars = {
84
- "now": today.strftime("%Y-%m-%d %H:%M:%S"),
85
- "today": today.strftime("%Y-%m-%d"),
86
- "year": today.strftime("%Y"),
87
- "month": today.strftime("%m"),
88
- "day": today.strftime("%d"),
85
+ "now": dt_now.strftime("%Y-%m-%d %H:%M:%S"),
86
+ "today": dt_now.strftime("%Y-%m-%d"),
87
+ "year": dt_now.strftime("%Y"),
88
+ "month": dt_now.strftime("%m"),
89
+ "day": dt_now.strftime("%d"),
89
90
  "biweekly_date": get_granular_date("biweekly", tz).strftime("%Y-%m-%d"),
90
- "today_stripped": today.strftime("%Y%m%d"),
91
- "now_stripped": today.strftime("%Y%m%d%H%M%S"),
91
+ "today_stripped": dt_now.strftime("%Y%m%d"),
92
+ "now_stripped": dt_now.strftime("%Y%m%d%H%M%S"),
92
93
  "dynaconf_merge": True,
93
94
  }
94
95
 
{datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: datamarket
3
- Version: 0.8.3
3
+ Version: 0.8.5
4
4
  Summary: Utilities that integrate advanced scraping knowledge into just one library.
5
5
  License: GPL-3.0-or-later
6
6
  Author: DataMarket
{datamarket-0.8.3.dist-info → datamarket-0.8.5.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ datamarket/interfaces/alchemy.py,sha256=V8E1GtokxUNmrUftKTFkIpNoXaqJME7ACES2BY0z
4
4
  datamarket/interfaces/aws.py,sha256=UztVuBn561DnU1AcjyJ16UAIS1BUD5HUxiQ4gc9EhtM,1968
5
5
  datamarket/interfaces/drive.py,sha256=shbV5jpQVe_KPE-8Idx6Z9te5Zu1SmVfrvSAyd9ZIgE,2915
6
6
  datamarket/interfaces/ftp.py,sha256=9GQgiNBBK7njkv8ytHQaP9YLB9kI5vnUFA5gtz9J7As,1859
7
- datamarket/interfaces/nominatim.py,sha256=WkPXaug-oH5zJkuE6aXMu4-MEkGYIY7S6TekfZ2FnHY,3658
7
+ datamarket/interfaces/nominatim.py,sha256=_gFJ04D-ju5xn3wuaGT5Pj5jhf4F5eINpxOpuQL_dIQ,3664
8
8
  datamarket/interfaces/peerdb.py,sha256=kJ3hdzGEACTfA_HM1b_I2rExY0x6ijCq5eOP1WObpLc,21821
9
9
  datamarket/interfaces/proxy.py,sha256=8EJaW8zAMzUMIRLkdAcMkTO9qZXPIubE6vyB5ZXcRtU,3352
10
10
  datamarket/interfaces/tinybird.py,sha256=AYrcRGNOCoCt7ojilkWa27POROee9sTCwZ61GGHEPeM,2698
@@ -13,11 +13,11 @@ datamarket/params/nominatim.py,sha256=pBYRfoBkkLBg2INbFymefmYSzaAVujQSpEro5c1hD_
13
13
  datamarket/utils/__init__.py,sha256=8D5a8oKgqd6WA1RUkiKCn4l_PVemtyuckxQut0vDHXM,20
14
14
  datamarket/utils/airflow.py,sha256=al0vc0YUikNu3Oy51VSn52I7pMU40akFBOl_UlHa2E4,795
15
15
  datamarket/utils/alchemy.py,sha256=SRq6kgh1aANXVShBPgAuglmNhZssPWwWEY503gKSia8,635
16
- datamarket/utils/main.py,sha256=SD0qVMQrGPCxRx2MCw4lsGmsLABMWLdbYdCr7d5G8U8,5499
16
+ datamarket/utils/main.py,sha256=fygFEz_lGUPrR39HOrcgE6aPX2ODPyTQNJOsgRQLN3g,5533
17
17
  datamarket/utils/selenium.py,sha256=IMKlbLzXABFhACnWzhHmB0l2hhVzNwHGZwbo14nEewQ,2499
18
18
  datamarket/utils/soda.py,sha256=eZTXFbI1P3WoMd1MM-YjoVTpdjTcDSWuvBb7ViBMhSQ,941
19
19
  datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
20
- datamarket-0.8.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
21
- datamarket-0.8.3.dist-info/METADATA,sha256=X-38YnliUdR5PQlVyLsnVNZwJXg3_76XUzIAJl8Bdtc,6176
22
- datamarket-0.8.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
23
- datamarket-0.8.3.dist-info/RECORD,,
20
+ datamarket-0.8.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
21
+ datamarket-0.8.5.dist-info/METADATA,sha256=FyCc0DDjxX6561caRYSyTb8W7PmSImVDssb9XDVenSw,6176
22
+ datamarket-0.8.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
23
+ datamarket-0.8.5.dist-info/RECORD,,