From 29b7b9a0c6aed0b600d62582f312cf73b26f124d Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Wed, 10 Mar 2021 02:02:26 +0100 Subject: [PATCH 1/2] Convert to native namespace packages as we are py36+, part of #162 --- fluent.docs/fluent/__init__.py | 1 - fluent.docs/setup.py | 4 ++-- fluent.pygments/fluent/__init__.py | 1 - fluent.pygments/setup.py | 5 ++--- fluent.runtime/fluent/__init__.py | 1 - fluent.runtime/setup.py | 5 ++--- fluent.syntax/fluent/__init__.py | 1 - fluent.syntax/setup.py | 5 ++--- 8 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 fluent.docs/fluent/__init__.py delete mode 100644 fluent.pygments/fluent/__init__.py mode change 100755 => 100644 fluent.pygments/setup.py delete mode 100644 fluent.runtime/fluent/__init__.py delete mode 100644 fluent.syntax/fluent/__init__.py mode change 100755 => 100644 fluent.syntax/setup.py diff --git a/fluent.docs/fluent/__init__.py b/fluent.docs/fluent/__init__.py deleted file mode 100644 index 69e3be50..00000000 --- a/fluent.docs/fluent/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/fluent.docs/setup.py b/fluent.docs/setup.py index 6a2dea31..15436d93 100644 --- a/fluent.docs/setup.py +++ b/fluent.docs/setup.py @@ -1,6 +1,6 @@ -from setuptools import setup +from setuptools import setup, find_namespace_packages setup( name='fluent.docs', - packages=['fluent', 'fluent.docs'], + packages=find_namespace_packages(include=['fluent.*']), ) diff --git a/fluent.pygments/fluent/__init__.py b/fluent.pygments/fluent/__init__.py deleted file mode 100644 index 69e3be50..00000000 --- a/fluent.pygments/fluent/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/fluent.pygments/setup.py b/fluent.pygments/setup.py old mode 100755 new mode 100644 index 966a6fea..e4695e20 --- a/fluent.pygments/setup.py +++ b/fluent.pygments/setup.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -from setuptools import setup +from setuptools import setup, find_namespace_packages import os this_directory = os.path.abspath(os.path.dirname(__file__)) @@ -25,6 +24,6 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3 :: Only', ], - packages=['fluent', 'fluent.pygments'], + packages=find_namespace_packages(include=['fluent.*']), test_suite='tests.pygments' ) diff --git a/fluent.runtime/fluent/__init__.py b/fluent.runtime/fluent/__init__.py deleted file mode 100644 index 69e3be50..00000000 --- a/fluent.runtime/fluent/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/fluent.runtime/setup.py b/fluent.runtime/setup.py index c52f8634..3c436c27 100755 --- a/fluent.runtime/setup.py +++ b/fluent.runtime/setup.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -from setuptools import setup +from setuptools import setup, find_namespace_packages import os this_directory = os.path.abspath(os.path.dirname(__file__)) @@ -26,7 +25,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3 :: Only', ], - packages=['fluent', 'fluent.runtime'], + packages=find_namespace_packages(include=['fluent.*']), # These should also be duplicated in tox.ini and /.github/workflows/fluent.runtime.yml install_requires=[ 'fluent.syntax>=0.17,<0.19', diff --git a/fluent.syntax/fluent/__init__.py b/fluent.syntax/fluent/__init__.py deleted file mode 100644 index 69e3be50..00000000 --- a/fluent.syntax/fluent/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/fluent.syntax/setup.py b/fluent.syntax/setup.py old mode 100755 new mode 100644 index 0b5f3aae..a703ef40 --- a/fluent.syntax/setup.py +++ b/fluent.syntax/setup.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -from setuptools import setup +from setuptools import setup, find_namespace_packages import os this_directory = os.path.abspath(os.path.dirname(__file__)) @@ -25,6 +24,6 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3 :: Only', ], - packages=['fluent', 'fluent.syntax'], + packages=find_namespace_packages(include=['fluent.*']), test_suite='tests.syntax' ) From 7befa68978221cfd51696066ef513bad7eb17ed9 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Wed, 10 Mar 2021 02:41:24 +0100 Subject: [PATCH 2/2] Fix warning in integration tests by declaring compat with upcoming syntax 0.20 --- fluent.runtime/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluent.runtime/setup.py b/fluent.runtime/setup.py index 3c436c27..a528f199 100755 --- a/fluent.runtime/setup.py +++ b/fluent.runtime/setup.py @@ -28,7 +28,7 @@ packages=find_namespace_packages(include=['fluent.*']), # These should also be duplicated in tox.ini and /.github/workflows/fluent.runtime.yml install_requires=[ - 'fluent.syntax>=0.17,<0.19', + 'fluent.syntax>=0.17,<0.20', 'attrs', 'babel', 'pytz',