2021-01-10 18:37:04 +01:00
|
|
|
From c9598b340afb37929b7d5456aef730304fba009b Mon Sep 17 00:00:00 2001
|
2020-05-14 21:27:20 +02:00
|
|
|
From: j1nx <p.steenbergen@j1nx.nl>
|
2021-01-10 18:37:04 +01:00
|
|
|
Date: Sun, 10 Jan 2021 18:19:16 +0100
|
2020-03-26 09:51:04 +01:00
|
|
|
Subject: [PATCH 1/1] Patch setup.py to use MANIFEST.in for package data
|
|
|
|
|
|
|
|
---
|
2021-01-10 18:37:04 +01:00
|
|
|
MANIFEST.in | 5 +----
|
2020-05-14 21:27:20 +02:00
|
|
|
setup.py | 16 ----------------
|
2021-01-10 18:37:04 +01:00
|
|
|
2 files changed, 1 insertion(+), 20 deletions(-)
|
2020-03-26 09:51:04 +01:00
|
|
|
|
|
|
|
diff --git a/MANIFEST.in b/MANIFEST.in
|
2021-01-10 18:37:04 +01:00
|
|
|
index 1f33302..97513c5 100644
|
|
|
|
--- a/MANIFEST.in
|
2020-03-26 09:51:04 +01:00
|
|
|
+++ b/MANIFEST.in
|
2021-01-10 18:37:04 +01:00
|
|
|
@@ -1,4 +1 @@
|
|
|
|
-include LICENSE
|
|
|
|
-include readme.md
|
|
|
|
-include requirements.txt
|
|
|
|
-recursive-include lingua_franca/res *
|
|
|
|
\ No newline at end of file
|
2020-03-26 09:51:04 +01:00
|
|
|
+graft lingua_franca
|
|
|
|
diff --git a/setup.py b/setup.py
|
2021-01-10 18:37:04 +01:00
|
|
|
index 41d0acc..707eafa 100644
|
2020-03-26 09:51:04 +01:00
|
|
|
--- a/setup.py
|
|
|
|
+++ b/setup.py
|
|
|
|
@@ -3,14 +3,6 @@ import os
|
|
|
|
from setuptools import setup
|
|
|
|
|
|
|
|
|
|
|
|
-def package_files(directory):
|
|
|
|
- paths = []
|
|
|
|
- for (path, directories, filenames) in os.walk(directory):
|
|
|
|
- for filename in filenames:
|
|
|
|
- paths.append(os.path.join('..', path, filename))
|
|
|
|
- return paths
|
|
|
|
-
|
|
|
|
-
|
|
|
|
def required(requirements_file):
|
|
|
|
""" Read requirements file and remove comments and empty lines. """
|
|
|
|
with open(os.path.join(os.path.dirname(__file__), requirements_file),
|
|
|
|
@@ -20,25 +12,17 @@ def required(requirements_file):
|
|
|
|
if pkg.strip() and not pkg.startswith("#")]
|
|
|
|
|
|
|
|
|
|
|
|
-extra_files = package_files('lingua_franca')
|
|
|
|
-
|
|
|
|
-with open("readme.md", "r") as fh:
|
|
|
|
- long_description = fh.read()
|
|
|
|
-
|
|
|
|
setup(
|
|
|
|
name='lingua_franca',
|
2021-01-10 18:37:04 +01:00
|
|
|
version='0.3.1',
|
2020-03-26 09:51:04 +01:00
|
|
|
packages=['test', 'lingua_franca', 'lingua_franca.lang'],
|
|
|
|
url='https://github.com/MycroftAI/lingua-franca',
|
|
|
|
license='Apache2.0',
|
|
|
|
- package_data={'': extra_files},
|
|
|
|
include_package_data=True,
|
|
|
|
install_requires=required('requirements.txt'),
|
|
|
|
author='Mycroft AI',
|
|
|
|
author_email='dev@mycroft.ai',
|
|
|
|
description='Mycroft\'s multilingual text parsing and formatting library',
|
|
|
|
- long_description=long_description,
|
|
|
|
- long_description_content_type="text/markdown",
|
|
|
|
classifiers=[
|
|
|
|
'Development Status :: 4 - Beta',
|
|
|
|
'Intended Audience :: Developers',
|
|
|
|
--
|
2020-05-14 21:27:20 +02:00
|
|
|
2.20.1
|
2020-03-26 09:51:04 +01:00
|
|
|
|