Bump ovos-lingua-franca
This commit is contained in:
parent
1192a1f1b4
commit
da256fef7f
|
@ -1,61 +0,0 @@
|
||||||
From 0917fee8cef66042341bfdf569167e650ba3fe23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: j1nx <p.steenbergen@j1nx.nl>
|
|
||||||
Date: Sun, 1 Jan 2023 14:40:31 +0100
|
|
||||||
Subject: [PATCH 1/1] Changes to setup
|
|
||||||
|
|
||||||
---
|
|
||||||
setup.py | 19 ++++---------------
|
|
||||||
1 file changed, 4 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index dc17012..cd7ca9d 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -1,22 +1,10 @@
|
|
||||||
import os
|
|
||||||
-from distutils.command.install import install
|
|
||||||
|
|
||||||
-import pip
|
|
||||||
from setuptools import setup
|
|
||||||
|
|
||||||
BASEDIR = os.path.abspath(os.path.dirname(__file__))
|
|
||||||
|
|
||||||
|
|
||||||
-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):
|
|
||||||
@@ -27,9 +15,11 @@ def package_files(directory):
|
|
||||||
|
|
||||||
def required(requirements_file):
|
|
||||||
""" Read requirements file and remove comments and empty lines. """
|
|
||||||
- with open(os.path.join(os.path.dirname(__file__), requirements_file),
|
|
||||||
- 'r') as f:
|
|
||||||
+ with open(os.path.join(BASEDIR, requirements_file), 'r') as f:
|
|
||||||
requirements = f.read().splitlines()
|
|
||||||
+ if 'MYCROFT_LOOSE_REQUIREMENTS' in os.environ:
|
|
||||||
+ print('USING LOOSE REQUIREMENTS!')
|
|
||||||
+ requirements = [r.replace('==', '>=').replace('~=', '>=') for r in requirements]
|
|
||||||
return [pkg for pkg in requirements
|
|
||||||
if pkg.strip() and not pkg.startswith("#")]
|
|
||||||
|
|
||||||
@@ -68,7 +58,6 @@ setup(
|
|
||||||
name='ovos-lingua-franca',
|
|
||||||
version=get_version(),
|
|
||||||
packages=['lingua_franca', 'lingua_franca.lang', 'lingua_franca.util'],
|
|
||||||
- cmdclass={'install': CustomInstall},
|
|
||||||
url='https://github.com/OpenVoiceOS/ovos-lingua-franca',
|
|
||||||
license='Apache2.0',
|
|
||||||
package_data={'': extra_files},
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
sha256 5589cc5cca4336da0fe222b8c1279355aa43d86e6a3283991b2c93fa667eb7e6 python-ovos-lingua-franca-86a8f117ce7ca56a9ccf9cea27bcd5e63a7b54c8.tar.gz
|
sha256 1511291c17d5747ce78468f5e05c6e6fa4c41dd68ee5e08507047c54cce5138c python-ovos-lingua-franca-0c4ead9b3ad396fc68a5b5c6465678b567c6c01f.tar.gz
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PYTHON_OVOS_LINGUA_FRANCA_VERSION = 86a8f117ce7ca56a9ccf9cea27bcd5e63a7b54c8
|
PYTHON_OVOS_LINGUA_FRANCA_VERSION = 0c4ead9b3ad396fc68a5b5c6465678b567c6c01f
|
||||||
PYTHON_OVOS_LINGUA_FRANCA_SITE = $(call github,OpenVoiceOS,ovos-lingua-franca,$(PYTHON_OVOS_LINGUA_FRANCA_VERSION))
|
PYTHON_OVOS_LINGUA_FRANCA_SITE = $(call github,OpenVoiceOS,ovos-lingua-franca,$(PYTHON_OVOS_LINGUA_FRANCA_VERSION))
|
||||||
PYTHON_OVOS_LINGUA_FRANCA_SETUP_TYPE = setuptools
|
PYTHON_OVOS_LINGUA_FRANCA_SETUP_TYPE = setuptools
|
||||||
PYTHON_OVOS_LINGUA_FRANCA_LICENSE = Apache-2.0
|
PYTHON_OVOS_LINGUA_FRANCA_LICENSE = Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue