pyLodStorage 0.2.7__tar.gz → 0.2.9__tar.gz

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.7
+Version: 0.2.9
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/lodstorage/querymain.py

@@ -102,8 +102,9 @@ class QueryMain:
                 doc=query.documentQueryResult(qlod, tablefmt=str(args.format),floatfmt=".0f")
                 docstr=doc.asText()
                 print (docstr)
-            elif args.format in [Format.json]:
-                print(json.dumps(qlod))
+            elif args.format in [Format.json] or args.format is None: # set as default
+                # https://stackoverflow.com/a/36142844/1497139
+                print(json.dumps(qlod,indent=2, sort_keys=True, default=str))
             elif args.format in [Format.xml]:
                 lod2xml=Lod2Xml(qlod)
                 xml=lod2xml.asXml()

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/lodstorage/trulytabular.py

@@ -292,7 +292,12 @@ WHERE
   # instance of {self.item.qlabel}
   ?item wdt:P31 wd:{self.item.qid}.{self.where}
 }}"""
-        return self.sparql.getValue(query, "count")
+        try:
+            count=self.sparql.getValue(query, "count")
+        except Exception as ex:
+            count=None
+            
+        return count
     
     def asText(self,long:bool=True):
         '''

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/lodstorage/version.py

@@ -9,6 +9,7 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.2.7'
+    version='0.2.9'
     date = '2020-09-10'
-    updated = '2022-07-02'
+    updated = '2022-07-23'
+    description='python List of Dict (Table) Storage library'

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/pylodstorage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.7
+Version: 0.2.9
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/pylodstorage.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 setup.py
+lodstorage/__init__.py
 lodstorage/csv.py
 lodstorage/entity.py
 lodstorage/jsonable.py

pylodstorage-0.2.9/pylodstorage.egg-info/requires.txt

@@ -0,0 +1,10 @@
+SPARQLWrapper~=1.8.5
+PyYAML
+pandas
+matplotlib
+tabulate
+numpy
+jsonpickle==1.5.2
+pylatexenc~=2.10
+pygments
+dicttoxml>=1.7.4

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/sampledata/wikidata.yaml

@@ -114,6 +114,9 @@
 'AcademicConferenceItemLabel':
   sparql: |
       # get the label for the given item
+      PREFIX p: <http://www.wikidata.org/prop/>
+      PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+      PREFIX wd: <http://www.wikidata.org/entity/>
       SELECT ?itemLabel
       WHERE
       {
@@ -123,3 +126,24 @@
         ?item rdfs:label ?itemLabel.
         filter (lang(?itemLabel) = "en").
       }
+'MachadoDeAssis':
+# https://stackoverflow.com/questions/71809883/sparql-query-dates-json-results-in-the-same-format-that-in-web-portal
+  sparql: |
+    # modified by WF 2022-07-22
+    PREFIX wd: <http://www.wikidata.org/entity/>
+    PREFIX wdt: <http://www.wikidata.org/prop/direct/>
+    PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+    SELECT ?author ?authorLabel ?birthDate
+    WHERE 
+    {
+      VALUES ?authorLabel {
+        "Machado de Assis"@pt
+      }
+      # Instance of Human
+      ?author wdt:P31 wd:Q5 .
+      # Joaquim Maria Machado de Assis
+      ?author rdfs:label ?authorLabel.
+      FILTER (LANG(?authorLabel) = "pt").
+      # birthDate
+      ?author wdt:P569 ?birthDate .
+    }

{pylodstorage-0.2.7 → pylodstorage-0.2.9}/setup.py

@@ -3,17 +3,19 @@
 from setuptools import setup
 from collections import OrderedDict
 from lodstorage.version import Version
+import pathlib
 
-# read the contents of your README file
-from os import path
-this_directory = path.abspath(path.dirname(__file__))
-with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
+# where is this setup file?
+here = pathlib.Path(__file__).parent.resolve()
+# get thre requirements
+requirements = (here / 'requirements.txt').read_text(encoding='utf-8').split("\n")
+# and the README content
+long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setup(
     name=Version.name,
     version=Version.version,
-
+    description=Version.description,
     packages=['lodstorage','sampledata'],
     package_data={
           'sampledata': ['*.yaml'],
@@ -30,23 +32,15 @@ setup(
         )
     ),
     license='Apache License',
-    description='python List of Dict (Table) Storage library',
-    install_requires=[
-          'SPARQLWrapper',
-          'PyYAML',
-          'pandas',
-          'jsonpickle',
-          'tabulate',
-          'pygments',
-          'pylatexenc~=2.10',
-          'dicttoxml~=1.7.4'
-    ],
+   
+    install_requires=requirements,
     classifiers=[
             'Programming Language :: Python',
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
-            'Programming Language :: Python :: 3.9'
+            'Programming Language :: Python :: 3.9',
+            'Programming Language :: Python :: 3.10'
     ],
     entry_points={
       'console_scripts': [

pylodstorage-0.2.7/pylodstorage.egg-info/requires.txt

@@ -1,8 +0,0 @@
-SPARQLWrapper
-PyYAML
-pandas
-jsonpickle
-tabulate
-pygments
-pylatexenc~=2.10
-dicttoxml~=1.7.4