Remove namespacing (#46)

Changes rmakers from namespaced package to vanilla package
Abjad · Feb 19, 2025 · 23fc01a · 23fc01a
1 parent 39f555f
commit 23fc01a
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 12 deletions.
diff --git a/conftest.py b/conftest.py
@@ -1,6 +1,6 @@
 import abjad
-import abjadext
 import pytest
+import rmakers
 
 
 @pytest.fixture(autouse=True)
@@ -9,4 +9,4 @@ def inject_abjad_into_doctest_namespace(doctest_namespace):
     Inject Abjad and rmakers into doctest namespace.
     """
     doctest_namespace["abjad"] = abjad
-    doctest_namespace["rmakers"] = abjadext.rmakers
+    doctest_namespace["rmakers"] = rmakers
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "abjad-ext-rmakers"
+name = "rmakers"
 version = "3.21"
 description = "rmakers extends Abjad with tools for rhythm construction."
 authors = [ { name = "Trevor Bača", email = "[email protected]" } ]
@@ -23,13 +23,11 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "http://abjad.github.io"
+Homepage = "http://rmakers.github.io"
 
 [tool.setuptools]
 package-dir = { "" = "source" }
 
 [tool.setuptools.packages.find]
 where = ["source"]
-
-[tool.setuptools.package-data]
-"abjadext" = ["**/*"]
+include = ["rmakers*"]
diff --git a/source/abjadext/__init__.py b/source/abjadext/__init__.py
diff --git a/source/abjadext/rmakers/__init__.py → source/rmakers/__init__.py b/source/abjadext/rmakers/__init__.py → source/rmakers/__init__.py
diff --git a/source/abjadext/rmakers/_todo.py → source/rmakers/_todo.py b/source/abjadext/rmakers/_todo.py → source/rmakers/_todo.py
diff --git a/source/abjadext/rmakers/_version.py → source/rmakers/_version.py b/source/abjadext/rmakers/_version.py → source/rmakers/_version.py
diff --git a/source/abjadext/rmakers/classes.py → source/rmakers/classes.py b/source/abjadext/rmakers/classes.py → source/rmakers/classes.py
diff --git a/source/abjadext/rmakers/functions.py → source/rmakers/functions.py b/source/abjadext/rmakers/functions.py → source/rmakers/functions.py
diff --git a/source/abjadext/rmakers/makers.py → source/rmakers/makers.py b/source/abjadext/rmakers/makers.py → source/rmakers/makers.py
diff --git a/source/abjadext/py.typed → source/rmakers/py.typed b/source/abjadext/py.typed → source/rmakers/py.typed
diff --git a/source/abjadext/rmakers/state.py → source/rmakers/state.py b/source/abjadext/rmakers/state.py → source/rmakers/state.py
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
@@ -1,6 +1,6 @@
 import abjad
 import pytest
-from abjadext import rmakers
+import rmakers
 
 
 def test_exceptions_01():

diff --git a/tests/test_tags.py b/tests/test_tags.py
@@ -1,5 +1,5 @@
 import abjad
-from abjadext import rmakers
+import rmakers
 
 
 def test_tags_01():