Remove namespacing (#92)

Abjad · Feb 20, 2025 · 404745d · 404745d
1 parent 8e5273e
commit 404745d
Show file tree

Hide file tree

Showing 71 changed files with 104 additions and 64 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: abjad-ext-nauert
+name: ci
 
 on:
   push:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,4 +4,4 @@ include conftest.py
 include mypy.ini
 include pytest.ini
 
-recursive-include abjadext/ *
+recursive-include source/nauert *
diff --git a/Makefile b/Makefile
@@ -21,14 +21,14 @@ flake8:
 	flake8 ${flake_ignore} ${flake_options}
 
 isort-check:
-	isort --case-sensitive --check-only --line-width=88 --multi-line=3 \
-	      --thirdparty=abjad --thirdparty=abjadext --thirdparty=baca \
-	      --thirdparty=ply --thirdparty=uqbar --trailing-comma --use-parentheses .
+	isort --case-sensitive --check-only --diff --line-width=88 --multi-line=3 \
+		  --project=nauert --thirdparty=abjad --thirdparty=ply --thirdparty=uqbar \
+		  --trailing-comma --use-parentheses .
 
 isort-reformat:
 	isort --case-sensitive --line-width=88 --multi-line=3 \
-	      --thirdparty=abjad --thirdparty=abjadext --thirdparty=baca \
-	      --thirdparty=ply --thirdparty=uqbar --trailing-comma --use-parentheses .
+		  --project=nauert --thirdparty=abjad --thirdparty=ply --thirdparty=uqbar \
+		  --trailing-comma --use-parentheses .
 
 mypy:
 	mypy source
@@ -41,7 +41,7 @@ pytest-coverage:
 	pytest \
 	--cov-config=.coveragerc \
 	--cov-report=html \
-	--cov=abjadext \
+	--cov=source/nauert \
 	.
 
 reformat: black-reformat isort-reformat

diff --git a/conftest.py b/conftest.py
@@ -1,6 +1,7 @@
 import abjad
 import pytest
-from abjadext import nauert
+
+import nauert
 
 
 @pytest.fixture(autouse=True)

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-nauert"
+name = "nauert"
 version = "3.21"
 description = "Nauert extends Abjad with tools for rhythm quantization."
 license = { text = "MIT" }
@@ -27,15 +27,14 @@ email = "[email protected]"
 
 [[project.authors]]
 name = "Tsz Kiu Pang"
+email = "[email protected]"
 
 [project.urls]
-Homepage = "http://abjad.github.io"
+Homepage = "http://nauert.github.io"
 
 [tool.setuptools]
 package-dir = { "" = "source" }
 
 [tool.setuptools.packages.find]
 where = ["source"]
-
-[tool.setuptools.package-data]
-"abjadext" = ["**/*"]
+include = ["nauert*"]
diff --git a/source/abjadext/__init__.py b/source/abjadext/__init__.py
diff --git a/source/abjadext/nauert/__init__.py → source/nauert/__init__.py b/source/abjadext/nauert/__init__.py → source/nauert/__init__.py
diff --git a/source/abjadext/nauert/_version.py → source/nauert/_version.py b/source/abjadext/nauert/_version.py → source/nauert/_version.py
diff --git a/.../abjadext/nauert/attackpointoptimizers.py → source/nauert/attackpointoptimizers.py b/.../abjadext/nauert/attackpointoptimizers.py → source/nauert/attackpointoptimizers.py
diff --git a/source/abjadext/nauert/gracehandlers.py → source/nauert/gracehandlers.py b/source/abjadext/nauert/gracehandlers.py → source/nauert/gracehandlers.py
diff --git a/source/abjadext/nauert/heuristics.py → source/nauert/heuristics.py b/source/abjadext/nauert/heuristics.py → source/nauert/heuristics.py
diff --git a/source/abjadext/nauert/jobhandlers.py → source/nauert/jobhandlers.py b/source/abjadext/nauert/jobhandlers.py → source/nauert/jobhandlers.py
diff --git a/source/abjadext/py.typed → source/nauert/py.typed b/source/abjadext/py.typed → source/nauert/py.typed
diff --git a/source/abjadext/nauert/qeventproxy.py → source/nauert/qeventproxy.py b/source/abjadext/nauert/qeventproxy.py → source/nauert/qeventproxy.py
diff --git a/source/abjadext/nauert/qevents.py → source/nauert/qevents.py b/source/abjadext/nauert/qevents.py → source/nauert/qevents.py
diff --git a/source/abjadext/nauert/qeventsequence.py → source/nauert/qeventsequence.py b/source/abjadext/nauert/qeventsequence.py → source/nauert/qeventsequence.py
diff --git a/source/abjadext/nauert/qgrid.py → source/nauert/qgrid.py b/source/abjadext/nauert/qgrid.py → source/nauert/qgrid.py
diff --git a/source/abjadext/nauert/qschemaitems.py → source/nauert/qschemaitems.py b/source/abjadext/nauert/qschemaitems.py → source/nauert/qschemaitems.py
diff --git a/source/abjadext/nauert/qschemas.py → source/nauert/qschemas.py b/source/abjadext/nauert/qschemas.py → source/nauert/qschemas.py
diff --git a/source/abjadext/nauert/qtargetitems.py → source/nauert/qtargetitems.py b/source/abjadext/nauert/qtargetitems.py → source/nauert/qtargetitems.py
diff --git a/source/abjadext/nauert/qtargets.py → source/nauert/qtargets.py b/source/abjadext/nauert/qtargets.py → source/nauert/qtargets.py
diff --git a/source/abjadext/nauert/quantizationjob.py → source/nauert/quantizationjob.py b/source/abjadext/nauert/quantizationjob.py → source/nauert/quantizationjob.py
diff --git a/source/abjadext/nauert/quantizer.py → source/nauert/quantizer.py b/source/abjadext/nauert/quantizer.py → source/nauert/quantizer.py
diff --git a/source/abjadext/nauert/searchtrees.py → source/nauert/searchtrees.py b/source/abjadext/nauert/searchtrees.py → source/nauert/searchtrees.py
diff --git a/tests/test_BeatwiseQSchemaItem___new__.py b/tests/test_BeatwiseQSchemaItem___new__.py
@@ -1,6 +1,7 @@
 import abjad
 import pytest
-from abjadext import nauert
+
+import nauert
 
 
 def test_BeatwiseQSchemaItem___new___01():

diff --git a/tests/test_BeatwiseQSchema___call__.py b/tests/test_BeatwiseQSchema___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_BeatwiseQSchema___call___01():

diff --git a/tests/test_BeatwiseQSchema___getitem__.py b/tests/test_BeatwiseQSchema___getitem__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_BeatwiseQSchema___getitem___01():

diff --git a/tests/test_BeatwiseQSchema___init__.py b/tests/test_BeatwiseQSchema___init__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_BeatwiseQSchema___init___01():

diff --git a/tests/test_CollapsingGraceHandler___call__.py b/tests/test_CollapsingGraceHandler___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_CollapsingGraceHandler___call___01():

diff --git a/tests/test_ConcatenatingGraceHandler___call__.py b/tests/test_ConcatenatingGraceHandler___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_ConcatenatingGraceHandler___call___01():

diff --git a/tests/test_ConcatenatingGraceHandler___init__.py b/tests/test_ConcatenatingGraceHandler___init__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_ConcatenatingGraceHandler___init___01():

diff --git a/tests/test_DiscardingGraceHandler___call__.py b/tests/test_DiscardingGraceHandler___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_DiscardingGraceHandler___call___01():

diff --git a/tests/test_DistanceHeuristic___call__.py b/tests/test_DistanceHeuristic___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_DistanceHeuristic___call___01():

diff --git a/tests/test_MeasurewiseAttackPointOptimizer___call__.py b/tests/test_MeasurewiseAttackPointOptimizer___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_MeasurewiseAttackPointOptimizer___call___01():

diff --git a/tests/test_MeasurewiseQSchemaItem___new__.py b/tests/test_MeasurewiseQSchemaItem___new__.py
@@ -1,6 +1,7 @@
 import abjad
 import pytest
-from abjadext import nauert
+
+import nauert
 
 
 def test_MeasurewiseQSchemaItem___new___01():

diff --git a/tests/test_MeasurewiseQSchema___call__.py b/tests/test_MeasurewiseQSchema___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_MeasurewiseQSchema___call___01():

diff --git a/tests/test_MeasurewiseQSchema___getitem__.py b/tests/test_MeasurewiseQSchema___getitem__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_MeasurewiseQSchema___getitem___01():

diff --git a/tests/test_MeasurewiseQSchema___init__.py b/tests/test_MeasurewiseQSchema___init__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_MeasurewiseQSchema___init___01():

diff --git a/tests/test_ParallelJobHandler___call__.py b/tests/test_ParallelJobHandler___call__.py
@@ -1,6 +1,7 @@
 import abjad
 import pytest
-from abjadext import nauert
+
+import nauert
 
 
 class Job:

diff --git a/tests/test_QEvent.py b/tests/test_QEvent.py
@@ -2,7 +2,8 @@
 
 import abjad
 import pytest
-from abjadext import nauert
+
+import nauert
 
 
 def test_PitchedQEvent___init___01():

diff --git a/tests/test_QEventProxy___init__.py b/tests/test_QEventProxy___init__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QEventProxy___init___01():

diff --git a/tests/test_QEventSequence_from_millisecond_durations.py b/tests/test_QEventSequence_from_millisecond_durations.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 test_time_segments = [
     (116, 255),

diff --git a/tests/test_QEventSequence_from_millisecond_pitch_attachment_tuples.py b/tests/test_QEventSequence_from_millisecond_pitch_attachment_tuples.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QEventSequence_from_millisecond_pitch_attachment_tuples_01():

diff --git a/tests/test_QEventSequence_from_millisecond_pitch_pairs.py b/tests/test_QEventSequence_from_millisecond_pitch_pairs.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QEventSequence_from_millisecond_pitch_pairs_01():

diff --git a/tests/test_QEventSequence_from_tempo_scaled_durations.py b/tests/test_QEventSequence_from_tempo_scaled_durations.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QEventSequence_from_tempo_scaled_durations_01():

diff --git a/tests/test_QEventSequence_from_tempo_scaled_leaves.py b/tests/test_QEventSequence_from_tempo_scaled_leaves.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QEventSequence_from_tempo_scaled_leaves_01():

diff --git a/tests/test_QGridContainer___copy__.py b/tests/test_QGridContainer___copy__.py
@@ -1,7 +1,8 @@
 import copy
 
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGridContainer___copy___01():

diff --git a/tests/test_QGridContainer___eq__.py b/tests/test_QGridContainer___eq__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGridContainer___eq___01():

diff --git a/tests/test_QGridLeaf___copy__.py b/tests/test_QGridLeaf___copy__.py
@@ -1,7 +1,8 @@
 import copy
 
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGridLeaf___copy___01():

diff --git a/tests/test_QGridLeaf___eq__.py b/tests/test_QGridLeaf___eq__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGridLeaf___eq___01():

diff --git a/tests/test_QGrid___call__.py b/tests/test_QGrid___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid___call___01():

diff --git a/tests/test_QGrid___copy__.py b/tests/test_QGrid___copy__.py
@@ -1,6 +1,6 @@
 import copy
 
-from abjadext import nauert
+import nauert
 
 
 def test_QGrid___copy___01():

diff --git a/tests/test_QGrid___eq__.py b/tests/test_QGrid___eq__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid___eq___01():

diff --git a/tests/test_QGrid_distance.py b/tests/test_QGrid_distance.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid_distance_01():

diff --git a/tests/test_QGrid_fit_q_events.py b/tests/test_QGrid_fit_q_events.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid_fit_q_events_01():

diff --git a/tests/test_QGrid_pickle.py b/tests/test_QGrid_pickle.py
@@ -1,7 +1,8 @@
 import pickle
 
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid_pickle_01():

diff --git a/tests/test_QGrid_subdivide_leaf.py b/tests/test_QGrid_subdivide_leaf.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid_subdivide_leaf_01():

diff --git a/tests/test_QGrid_subdivide_leaves.py b/tests/test_QGrid_subdivide_leaves.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QGrid_subdivide_leaves_01():

diff --git a/tests/test_QuantizationJob___call__.py b/tests/test_QuantizationJob___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QuantizationJob___call___01():

diff --git a/tests/test_QuantizationJob___init__.py b/tests/test_QuantizationJob___init__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QuantizationJob___init___01():

diff --git a/tests/test_QuantizationJob_pickle.py b/tests/test_QuantizationJob_pickle.py
@@ -1,7 +1,8 @@
 import pickle
 
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def test_QuantizationJob_pickle_01():

diff --git a/tests/test_Quantizer___call__.py b/tests/test_Quantizer___call__.py
@@ -1,5 +1,6 @@
 import abjad
-from abjadext import nauert
+
+import nauert
 
 
 def assert_q_event_attachments(result, all_attachments):