Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove namespacing #92

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: abjad-ext-nauert
name: ci

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ include conftest.py
include mypy.ini
include pytest.ini

recursive-include abjadext/ *
recursive-include source/nauert *
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,7 +41,7 @@ pytest-coverage:
pytest \
--cov-config=.coveragerc \
--cov-report=html \
--cov=abjadext \
--cov=source/nauert \
.

reformat: black-reformat isort-reformat
Expand Down
3 changes: 2 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import abjad
import pytest
from abjadext import nauert

import nauert


@pytest.fixture(autouse=True)
Expand Down
9 changes: 4 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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*"]
3 changes: 0 additions & 3 deletions source/abjadext/__init__.py

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion tests/test_BeatwiseQSchemaItem___new__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import abjad
import pytest
from abjadext import nauert

import nauert


def test_BeatwiseQSchemaItem___new___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_BeatwiseQSchema___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_BeatwiseQSchema___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_BeatwiseQSchema___getitem__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_BeatwiseQSchema___getitem___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_BeatwiseQSchema___init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_BeatwiseQSchema___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_CollapsingGraceHandler___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_CollapsingGraceHandler___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_ConcatenatingGraceHandler___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_ConcatenatingGraceHandler___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_ConcatenatingGraceHandler___init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_ConcatenatingGraceHandler___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_DiscardingGraceHandler___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_DiscardingGraceHandler___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_DistanceHeuristic___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_DistanceHeuristic___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_MeasurewiseAttackPointOptimizer___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_MeasurewiseAttackPointOptimizer___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_MeasurewiseQSchemaItem___new__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import abjad
import pytest
from abjadext import nauert

import nauert


def test_MeasurewiseQSchemaItem___new___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_MeasurewiseQSchema___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_MeasurewiseQSchema___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_MeasurewiseQSchema___getitem__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_MeasurewiseQSchema___getitem___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_MeasurewiseQSchema___init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_MeasurewiseQSchema___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_ParallelJobHandler___call__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import abjad
import pytest
from abjadext import nauert

import nauert


class Job:
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEvent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import abjad
import pytest
from abjadext import nauert

import nauert


def test_PitchedQEvent___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEventProxy___init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QEventProxy___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEventSequence_from_millisecond_durations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert

test_time_segments = [
(116, 255),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QEventSequence_from_millisecond_pitch_attachment_tuples_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEventSequence_from_millisecond_pitch_pairs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QEventSequence_from_millisecond_pitch_pairs_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEventSequence_from_tempo_scaled_durations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QEventSequence_from_tempo_scaled_durations_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QEventSequence_from_tempo_scaled_leaves.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QEventSequence_from_tempo_scaled_leaves_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGridContainer___copy__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import copy

import abjad
from abjadext import nauert

import nauert


def test_QGridContainer___copy___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGridContainer___eq__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGridContainer___eq___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGridLeaf___copy__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import copy

import abjad
from abjadext import nauert

import nauert


def test_QGridLeaf___copy___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGridLeaf___eq__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGridLeaf___eq___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid___call___01():
Expand Down
2 changes: 1 addition & 1 deletion tests/test_QGrid___copy__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import copy

from abjadext import nauert
import nauert


def test_QGrid___copy___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid___eq__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid___eq___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid_distance.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid_distance_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid_fit_q_events.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid_fit_q_events_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid_pickle.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pickle

import abjad
from abjadext import nauert

import nauert


def test_QGrid_pickle_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid_subdivide_leaf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid_subdivide_leaf_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QGrid_subdivide_leaves.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QGrid_subdivide_leaves_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QuantizationJob___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QuantizationJob___call___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QuantizationJob___init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def test_QuantizationJob___init___01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_QuantizationJob_pickle.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pickle

import abjad
from abjadext import nauert

import nauert


def test_QuantizationJob_pickle_01():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_Quantizer___call__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import abjad
from abjadext import nauert

import nauert


def assert_q_event_attachments(result, all_attachments):
Expand Down
Loading