Skip to content

Commit c49b82e

Browse files
authored
Merge pull request #240 from dathere/fix-issues-with-extract-messages
Fix issues with extract messages
2 parents aa7752a + ad99fda commit c49b82e

File tree

3 files changed

+38
-98
lines changed

3 files changed

+38
-98
lines changed

pyproject.toml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@ description = "Next-generation, extensible Data Ingestion framework for CKAN. Ac
55
readme = "README.md"
66
requires-python = ">=3.10"
77
license = { text = "AGPL-3.0-or-later" }
8-
authors = [
9-
{ name = "datHere" },
8+
authors = [{ name = "datHere" }]
9+
maintainers = [{ name = "datHere Engineering", email = "[email protected]" }]
10+
keywords = [
11+
"ckan",
12+
"ckanext",
13+
"datapusher",
14+
"datastore",
15+
"csv",
16+
"qsv",
17+
"data-ingestion",
18+
"metadata",
19+
"schema",
1020
]
11-
maintainers = [
12-
{ name = "datHere Engineering", email = "[email protected]" }
13-
]
14-
keywords = ["ckan", "ckanext", "datapusher", "datastore", "csv", "qsv", "data-ingestion", "metadata", "schema"]
1521
classifiers = [
1622
"Intended Audience :: Developers",
1723
"Development Status :: 5 - Production/Stable",
@@ -23,10 +29,15 @@ classifiers = [
2329
"Programming Language :: Python :: 3.13",
2430
"Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
2531
"Topic :: Software Development :: Libraries :: Application Frameworks",
26-
"Topic :: Database"
32+
"Topic :: Database",
2733
]
28-
urls = { Repository = "https://github.com/dathere/datapusher-plus", Issues = "https://github.com/dathere/datapusher-plus/issues", Changelog = "https://github.com/dathere/datapusher-plus/blob/main/CHANGELOG.md" }
29-
dynamic = ["dependencies", "optional-dependencies"]
34+
35+
[project.urls]
36+
Homepage = "https://github.com/dathere/datapusher-plus"
37+
Repository = "https://github.com/dathere/datapusher-plus"
38+
Issues = "https://github.com/dathere/datapusher-plus/issues"
39+
Changelog = "https://github.com/dathere/datapusher-plus/blob/main/CHANGELOG.md"
40+
Documentation = "https://github.com/dathere/datapusher-plus#readme"
3041

3142
[project.entry-points."ckan.plugins"]
3243
datapusher_plus = "ckanext.datapusher_plus.plugin:DatapusherPlusPlugin"

setup.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
[options]
2+
packages = find:
3+
namespace_packages = ckanext
4+
install_requires =
5+
include_package_data = true
6+
7+
[options.entry_points]
8+
babel.extractors =
9+
ckan = ckan.lib.extract:extract_ckan
10+
111
[extract_messages]
212
keywords = translate isPlural
313
add_comments = TRANSLATORS:

setup.py

Lines changed: 8 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,12 @@
11
# -*- coding: utf-8 -*-
2-
# flake8: noqa: E501
3-
4-
# Always prefer setuptools over distutils
5-
from setuptools import setup, find_packages
6-
from codecs import open # To use a consistent encoding
7-
from os import path
8-
9-
here = path.abspath(path.dirname(__file__))
10-
11-
# Get the long description from the relevant file
12-
with open(path.join(here, "README.md"), encoding="utf-8") as f:
13-
long_description = f.read()
142

3+
from setuptools import setup
154
setup(
16-
name="datapusher-plus",
17-
# Versions should comply with PEP440. For a discussion on single-sourcing
18-
# the version across setup.py and the project code, see
19-
# http://packaging.python.org/en/latest/tutorial.html#version
20-
version="2.0.0",
21-
description="Next-generation, extensible Data Ingestion framework for CKAN. Accelerated by qsv.",
22-
long_description=long_description,
23-
long_description_content_type="text/markdown",
24-
# The project's main homepage.
25-
url="https://github.com/dathere/datapusher-plus",
26-
# Choose your license
27-
license="AGPL",
28-
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
29-
classifiers=[
30-
# How mature is this project? Common values are
31-
# 3 - Alpha
32-
# 4 - Beta
33-
# 5 - Production/Stable
34-
"Development Status :: 5 - Production/Stable",
35-
# Pick your license as you wish (should match "license" above)
36-
"License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
37-
# Specify the Python versions you support here. In particular, ensure
38-
# that you indicate whether you support Python 2, Python 3 or both.
39-
"Programming Language :: Python :: 3.10",
40-
"Programming Language :: Python :: 3.11",
41-
"Programming Language :: Python :: 3.12",
42-
"Programming Language :: Python :: 3.13",
43-
],
44-
# What does your project relate to?
45-
keywords="ckan csv tsv xls ods excel qsv",
46-
# You can just specify the packages manually here if your project is
47-
# simple. Or you can use find_packages().
48-
packages=find_packages(exclude=["tests*"]),
49-
# setup_requires=['wheel'],
50-
# List run-time dependencies here. These will be installed by pip when your
51-
# project is installed. For an analysis of "install_requires" vs pip's
52-
# requirements files see:
53-
# https://packaging.python.org/en/latest/discussions/install-requires-vs-requirements/
54-
install_requires=[
55-
# CKAN extensions should not list dependencies here, but in a separate
56-
# ``requirements.txt`` file.
57-
#
58-
# http://docs.ckan.org/en/latest/extensions/best-practices.html#add-third-party-libraries-to-requirements-txt
59-
"jinja2>=3.1.4",
60-
"fiona==1.10.1",
61-
"pandas>=2.2.3",
62-
"semver==3.0.4",
63-
"shapely>=2.1.0",
64-
"pyproj>=3.7.1",
65-
],
66-
# If there are data files included in your packages that need to be
67-
# installed, specify them here. If using Python 2.6 or less, then these
68-
# have to be included in MANIFEST.in as well.
69-
package_data={},
70-
# Although 'package_data' is the preferred approach, in some case you may
71-
# need to place data files outside of your packages.
72-
# see http://docs.python.org/3.8/distutils/setupscript.html#installing-additional-files
73-
# In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
74-
data_files=[],
75-
# To provide executable scripts, use entry points in preference to the
76-
# "scripts" keyword. Entry points provide cross-platform support and allow
77-
# pip to create the appropriate form of executable for the target platform.
78-
entry_points="""
79-
[ckan.plugins]
80-
datapusher_plus=ckanext.datapusher_plus.plugin:DatapusherPlusPlugin
81-
82-
[babel.extractors]
83-
ckan = ckan.lib.extract:extract_ckan
84-
85-
""",
86-
# message_extractors={
87-
# "ckanext": [
88-
# ("**.py", "python", None),
89-
# ("**.js", "javascript", None),
90-
# ("**/templates/**.html", "ckan", None),
91-
# ],
92-
# },
5+
message_extractors={
6+
"ckanext": [
7+
("**.py", "python", None),
8+
("**.js", "javascript", None),
9+
("**/templates/**.html", "ckan", None),
10+
],
11+
},
9312
)

0 commit comments

Comments
 (0)