Convert to native namespace packages as we are py36+, part of #162 (#164

) * Convert to native namespace packages as we are py36+, part of #162 * Fix warning in integration tests by declaring compat with upcoming syntax 0.20
projectfluent · Apr 9, 2021 · c58681f · c58681f
1 parent 7b73fde
commit c58681f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/fluent.docs/fluent/__init__.py b/fluent.docs/fluent/__init__.py
diff --git 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
diff --git 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
diff --git 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,10 +25,10 @@
           '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',
+          'fluent.syntax>=0.17,<0.20',
           'attrs',
           'babel',
           'pytz',

diff --git a/fluent.syntax/fluent/__init__.py b/fluent.syntax/fluent/__init__.py
diff --git 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'
       )