Skip to content

Commit

Permalink
Merge branch 'main' into ckan-version
Browse files Browse the repository at this point in the history
  • Loading branch information
btylerburton authored Sep 11, 2023
2 parents 4937a4e + d10bc1e commit 16c4161
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion ckanext/geodatagov/logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ def translate_spatial(old_spatial):
# all trailing decimals, '[34., 2]' is not valid, but '[34.0, 2]' and '[34, 2]' are valid
old_spatial_transformed = old_spatial_transformed.replace('.,', ',').replace('.]', ']')
# '-98, 29, -83, 35.' is not valid
if old_spatial_transformed[-1] == '.':
if old_spatial_transformed != "" and old_spatial_transformed[-1] == '.':
old_spatial_transformed = old_spatial_transformed[0:-1]
# all leading 0s, '[-089.63, 30.36]' is not valid, '[-89.63, 30.36]' is valid
old_spatial_transformed = re.sub(r'(^|\s)(-?)0+((0|[1-9][0-9]*)(\.[0-9]*)?)', r'\1\2\3', old_spatial_transformed)
Expand Down
2 changes: 1 addition & 1 deletion ckanext/geodatagov/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def get_paginated_entity_name_modtime(self, max_results=1000, start=0):
data = conn.search(query,
fq=fq,
rows=max_results,
fields='name,metadata_modified',
fl='name,metadata_modified',
start=start,
sort='metadata_created asc')
except Exception as e:
Expand Down
30 changes: 15 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
here = path.abspath(path.dirname(__file__))

# Get the long description from the relevant file
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
with open(path.join(here, "README.md"), encoding="utf-8") as f:
long_description = f.read()

setup(
name="ckanext-geodatagov",
version="0.2.1",
version="0.2.3",
description="",
long_description=long_description,
long_description_content_type='text/markdown',
long_description_content_type="text/markdown",
classifiers=[
'Programming Language :: Python :: 3'
"Programming Language :: Python :: 3"
], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
keywords='',
author='Data.gov',
author_email='[email protected]',
url='https://github.com/GSA/ckanext-geodatagov',
license='',
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
namespace_packages=['ckanext', 'ckanext.geodatagov'],
keywords="",
author="Data.gov",
author_email="[email protected]",
url="https://github.com/GSA/ckanext-geodatagov",
license="",
packages=find_packages(exclude=["ez_setup", "examples", "tests"]),
namespace_packages=["ckanext", "ckanext.geodatagov"],
include_package_data=True,
zip_safe=False,
install_requires=[
# -*- Extra requirements: -*-
'ckanext-datajson>=0.1.19',
'boto3',
'ply>=3.4',
"ckanext-datajson>=0.1.19",
"boto3",
"ply>=3.4",
],
setup_requires=['wheel'],
setup_requires=["wheel"],
entry_points="""
[ckan.plugins]
# Add plugins here, eg
Expand Down

0 comments on commit 16c4161

Please sign in to comment.