From 64e09cb7e2d624ab7fead6992dacefd337b27ee8 Mon Sep 17 00:00:00 2001 From: jarbasai Date: Tue, 18 Jan 2022 16:01:43 +0000 Subject: [PATCH] feat/replace lingua_franca - renames package to ovos-lingua-franca - uninstall lingua_franca on pip install --- readme.md | 13 +++++-------- setup.py | 25 +++++++++++++++++++------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/readme.md b/readme.md index abf3c979..5bf1f1d4 100644 --- a/readme.md +++ b/readme.md @@ -1,16 +1,13 @@ -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE.md) [![CLA](https://img.shields.io/badge/CLA%3F-Required-blue.svg)](https://mycroft.ai/cla) [![Team](https://img.shields.io/badge/Team-Languages-violetblue.svg)](https://github.com/MycroftAI/contributors/blob/master/team/Languages.md) ![Status](https://img.shields.io/badge/-Alpha-orange.svg) +# OpenVoiceOS Lingua Franca -[![Build Status](https://travis-ci.org/MycroftAI/lingua-franca.svg?branch=master)](https://travis-ci.org/MycroftAI/lingua-franca) [![Coverage Status](https://coveralls.io/repos/github/MycroftAI/lingua-franca/badge.svg?branch=master)](https://coveralls.io/github/MycroftAI/lingua-franca?branch=master) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com) -[![Join chat](https://img.shields.io/badge/Mattermost-join_chat-brightgreen.svg)](https://chat.mycroft.ai/community/channels/languages) - -# Lingua Franca - -Mycroft's multilingual text parsing and formatting library +OpenVoiceOS's multilingual text parsing and formatting library Lingua Franca (_noun_)
> a framework that is adopted as the common language between speakers with different native tongues +This project has been forked from mycroft-core, it replaces it! + +:warning: `pip install ovos-lingua-franca` will also `pip uninstall lingua-franca -y` :warning: - [Lingua Franca](#lingua-franca) - [Formatting](#formatting) diff --git a/setup.py b/setup.py index f9ced471..31101c59 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,20 @@ import os +from distutils.command.install import install +import pip from setuptools import setup +class CustomInstall(install): + """Custom handler for the 'install' command.""" + + def run(self): + # uninstall lingua_franca + # the whole purpose of this package is to replace it + pip.main(["uninstall", "lingua_franca", "-y"]) + super().run() + + def package_files(directory): paths = [] for (path, directories, filenames) in os.walk(directory): @@ -26,17 +38,18 @@ def required(requirements_file): long_description = fh.read() setup( - name='lingua_franca', - version='0.4.2', + name='ovos-lingua-franca', + version='0.4.3a1', packages=['lingua_franca', 'lingua_franca.lang'], - url='https://github.com/MycroftAI/lingua-franca', + cmdclass={'install': CustomInstall}, + url='https://github.com/OpenVoiceOS/lingua_plus', 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', + author='Mycroft AI / OVOS', + author_email='jarbasai@mailfence.com', + description='OpenVoiceOS\'s multilingual text parsing and formatting library', long_description=long_description, long_description_content_type="text/markdown", classifiers=[