From ea491a2cfa17185f40eff18bb08bc5d659099f4d Mon Sep 17 00:00:00 2001 From: Harpo Date: Sat, 17 Sep 2022 08:26:33 -0700 Subject: [PATCH 1/6] Add pluggy to requirements, pin max versions --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0086a37..7ed4be6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -python-rtmidi +python-rtmidi >=1.4.9, < 1.5 +pluggy >= 1.0.0, < 1.1 \ No newline at end of file From de967fb8578d82da3627e3d852409162b5bdfe8a Mon Sep 17 00:00:00 2001 From: Harpo Date: Sat, 17 Sep 2022 08:32:10 -0700 Subject: [PATCH 2/6] Update install_requires --- requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7ed4be6..1c7f323 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ +pluggy >= 1.0.0, < 1.1 python-rtmidi >=1.4.9, < 1.5 -pluggy >= 1.0.0, < 1.1 \ No newline at end of file diff --git a/setup.py b/setup.py index f60faad..4d4cf66 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='holophonor', - install_requires='pluggy>=1.0,<1.1', + install_requires=['pluggy >= 1.0, < 1.1', 'python-rtmidi >= 1.4.9, < 1.5'], entry_points={'console_scripts': ['holophonor=holophonor.main:main']}, packages=find_packages(), -) \ No newline at end of file +) From c27ab8044ef4efe694f21b53410f9a5e55fb6c8f Mon Sep 17 00:00:00 2001 From: Harpo Date: Sat, 8 Apr 2023 09:53:12 -0700 Subject: [PATCH 3/6] Adds version number --- holophonor/__init__.py | 1 + holophonor/_version.py | 1 + 2 files changed, 2 insertions(+) create mode 100644 holophonor/_version.py diff --git a/holophonor/__init__.py b/holophonor/__init__.py index 54f1d2a..fc8b307 100644 --- a/holophonor/__init__.py +++ b/holophonor/__init__.py @@ -1,3 +1,4 @@ +from _version import __version__ from pluggy import HookimplMarker holoimpl = HookimplMarker("holophonor") diff --git a/holophonor/_version.py b/holophonor/_version.py new file mode 100644 index 0000000..b794fd4 --- /dev/null +++ b/holophonor/_version.py @@ -0,0 +1 @@ +__version__ = '0.1.0' From 74e13c748f9a0c9a6f1c6a20dcfeed614d72a51f Mon Sep 17 00:00:00 2001 From: Harpo Date: Sat, 8 Apr 2023 12:59:34 -0700 Subject: [PATCH 4/6] Migrate to pdm --- pdm.lock | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ pyproject.toml | 25 +++++++++++++++++ requirements.txt | 2 -- setup.py | 8 ------ 4 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 pdm.lock create mode 100644 pyproject.toml delete mode 100644 requirements.txt delete mode 100644 setup.py diff --git a/pdm.lock b/pdm.lock new file mode 100644 index 0000000..5883431 --- /dev/null +++ b/pdm.lock @@ -0,0 +1,72 @@ +# This file is @generated by PDM. +# It is not intended for manual editing. + +[[package]] +name = "colorama" +version = "0.4.6" +requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +summary = "Cross-platform colored terminal text." + +[[package]] +name = "loguru" +version = "0.6.0" +requires_python = ">=3.5" +summary = "Python logging made (stupidly) simple" +dependencies = [ + "colorama>=0.3.4; sys_platform == \"win32\"", + "win32-setctime>=1.0.0; sys_platform == \"win32\"", +] + +[[package]] +name = "pluggy" +version = "1.0.0" +requires_python = ">=3.6" +summary = "plugin and hook calling mechanisms for python" + +[[package]] +name = "python-rtmidi" +version = "1.4.9" +summary = "A Python binding for the RtMidi C++ library implemented using Cython." + +[[package]] +name = "win32-setctime" +version = "1.1.0" +requires_python = ">=3.5" +summary = "A small Python utility to set file creation time on Windows" + +[metadata] +lock_version = "4.1" +content_hash = "sha256:0dac04ec05d7cff69201d89fc339c48e43d1922c26b50e573e408e31143da4e3" + +[metadata.files] +"colorama 0.4.6" = [ + {url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] +"loguru 0.6.0" = [ + {url = "https://files.pythonhosted.org/packages/75/1f/d3818863e4be96bd641c4643c535a98f0fa2a12efa7c8ba35f763fa778ee/loguru-0.6.0.tar.gz", hash = "sha256:066bd06758d0a513e9836fd9c6b5a75bfb3fd36841f4b996bc60b547a309d41c"}, + {url = "https://files.pythonhosted.org/packages/fe/21/e1d1da2586865a159fc73b611f36bdd50b6c4043cb6132d3d5e972988028/loguru-0.6.0-py3-none-any.whl", hash = "sha256:4e2414d534a2ab57573365b3e6d0234dfb1d84b68b7f3b948e6fb743860a77c3"}, +] +"pluggy 1.0.0" = [ + {url = "https://files.pythonhosted.org/packages/9e/01/f38e2ff29715251cf25532b9082a1589ab7e4f571ced434f98d0139336dc/pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {url = "https://files.pythonhosted.org/packages/a1/16/db2d7de3474b6e37cbb9c008965ee63835bba517e22cdb8c35b5116b5ce1/pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, +] +"python-rtmidi 1.4.9" = [ + {url = "https://files.pythonhosted.org/packages/2e/b5/e118bf9d210ffdf82b58b9f2bd30219621e19256296d01a60fac84441063/python_rtmidi-1.4.9-cp39-cp39-win_amd64.whl", hash = "sha256:54d40cb794a6b079105bfb923ab0b4d5f041e9eef5dc5cce25480e4c3e3fc2f6"}, + {url = "https://files.pythonhosted.org/packages/40/46/6d805e8b145c08294e1bdb19b91133e5e279f86d2048218f178555d455ae/python_rtmidi-1.4.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:04bd95dd86fef3fe8d72838f719d31875f107a842127024bfe276617961eed5d"}, + {url = "https://files.pythonhosted.org/packages/65/e5/82275aa174bb07123e9154da4feeae901f238dea03e685eaf26ef8f41024/python_rtmidi-1.4.9-cp38-cp38-win_amd64.whl", hash = "sha256:69907663e0f167fcf3fc1632a792419d0d9d00550f94dca39370ebda3bc999db"}, + {url = "https://files.pythonhosted.org/packages/6f/9c/00bea0b76417b85afb99eaf8bad54bff0ead587d0f40e7f7c0f0f592f105/python_rtmidi-1.4.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5dad7a28035eea9e24aaab4fcb756cd2b78c5b14835aa64750cb4062f77ec169"}, + {url = "https://files.pythonhosted.org/packages/71/06/6c650c2e21bfa642d13a96f0ee210e705f0b2fdb75a675864f9e450f07fb/python_rtmidi-1.4.9-cp39-cp39-win32.whl", hash = "sha256:2286ab096a5603430ab1e1a664fe4d96acc40f9443f44c27e911dfad85ea3ac8"}, + {url = "https://files.pythonhosted.org/packages/90/bd/0e3446978f4a3cd0635a321c01c3d3c84d7266976b4c7c0ff050103ae188/python_rtmidi-1.4.9-cp37-cp37m-win32.whl", hash = "sha256:0f5409e1b2e92cfe377710a0ea5c450c58fda8b52ec4bf4baf517aa731d9f6a6"}, + {url = "https://files.pythonhosted.org/packages/92/bf/749468bc43f85ec77f37154327360ba82e7d0ae622341eab44a6d75751c3/python-rtmidi-1.4.9.tar.gz", hash = "sha256:bfeb4ed99d0cccf6fa2837566907652ded7adc1c03b69f2160c9de4082301302"}, + {url = "https://files.pythonhosted.org/packages/99/24/fc843187a27c82f833afac3c1379e9b8dd596df01666e9cacfcab796d8f8/python_rtmidi-1.4.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d201516bb1c64511e7e4de50533f6b828072113e3c26f3f5b657f11b90252073"}, + {url = "https://files.pythonhosted.org/packages/c5/9a/a35b9cd4e12e0d08ba36faa2aad97bac2a193e41bdea8e20372684272ded/python_rtmidi-1.4.9-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:8f7e154681c5d6ed7228ce8639708592da758ef4c0f575f7020854e07ca6478b"}, + {url = "https://files.pythonhosted.org/packages/de/67/1a428f8441142eee88ea03bb9192c5e223e31c543e6ca78d8a2019c40c55/python_rtmidi-1.4.9-cp37-cp37m-win_amd64.whl", hash = "sha256:3d4b7fdb477d8036d51cce281b303686114ae676f1c83693db963ab01db11cf5"}, + {url = "https://files.pythonhosted.org/packages/e0/04/a4ca278a58e9823aaedead4567fa84ed54d4f55d26e0848afe9a0903f93b/python_rtmidi-1.4.9-cp36-cp36m-win32.whl", hash = "sha256:6f495672ec76700400d4dff6f8848dbd52ca60301ed6011a6a1b3a9e95a7a07e"}, + {url = "https://files.pythonhosted.org/packages/f1/99/d2ca37edc52f0e0755b69cbc44e147e9a1236d87f7d01b00f5bcd27dfe1b/python_rtmidi-1.4.9-cp36-cp36m-win_amd64.whl", hash = "sha256:4d75788163327f6ac1f898c29e3b4527da83dbc5bab5a7e614b6a4385fde3231"}, + {url = "https://files.pythonhosted.org/packages/f6/69/36256c523b25baf5e02e30d9df2f1ad87403299721c785cd195a43fe7996/python_rtmidi-1.4.9-cp38-cp38-win32.whl", hash = "sha256:7d27d0a70e85d991f1451f286416cf5ef4514292b027155bf91dcae0b8c0d5d2"}, +] +"win32-setctime 1.1.0" = [ + {url = "https://files.pythonhosted.org/packages/0a/e6/a7d828fef907843b2a5773ebff47fb79ac0c1c88d60c0ca9530ee941e248/win32_setctime-1.1.0-py3-none-any.whl", hash = "sha256:231db239e959c2fe7eb1d7dc129f11172354f98361c4fa2d6d2d7e278baa8aad"}, + {url = "https://files.pythonhosted.org/packages/6b/dd/f95a13d2b235a28d613ba23ebad55191514550debb968b46aab99f2e3a30/win32_setctime-1.1.0.tar.gz", hash = "sha256:15cf5750465118d6929ae4de4eb46e8edae9a5634350c01ba582df868e932cb2"}, +] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..0a5f263 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,25 @@ +[tool.pdm] + +[project] +name = "holophonor" +version = "0.1.0" +description = "Live looping, unlimited!" +authors = [ + {name = "Quaternion Media", email = "holophonor@quaternion.media"}, +] +dependencies = [ + "pluggy<1.1,>=1.0.0", + "python-rtmidi<1.5,>=1.4.9", + "loguru>=0.6.0", +] +requires-python = ">=3.8.1, < 4" +readme = "README.md" +license = {text = "MIT"} + +[project.scripts] +holophonor = "holophonor.main:main" + +[build-system] +requires = ["pdm-backend"] +build-backend = "pdm.backend" + diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 1c7f323..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pluggy >= 1.0.0, < 1.1 -python-rtmidi >=1.4.9, < 1.5 diff --git a/setup.py b/setup.py deleted file mode 100644 index 4d4cf66..0000000 --- a/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name='holophonor', - install_requires=['pluggy >= 1.0, < 1.1', 'python-rtmidi >= 1.4.9, < 1.5'], - entry_points={'console_scripts': ['holophonor=holophonor.main:main']}, - packages=find_packages(), -) From 0988f517bbc7ec6ae3700b743b04991048efdf1d Mon Sep 17 00:00:00 2001 From: Harpo Date: Sat, 8 Apr 2023 13:02:28 -0700 Subject: [PATCH 5/6] Adds dynamic versioning with pdm --- holophonor/__init__.py | 2 +- pyproject.toml | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/holophonor/__init__.py b/holophonor/__init__.py index fc8b307..fac957e 100644 --- a/holophonor/__init__.py +++ b/holophonor/__init__.py @@ -1,4 +1,4 @@ -from _version import __version__ +from ._version import __version__ from pluggy import HookimplMarker holoimpl = HookimplMarker("holophonor") diff --git a/pyproject.toml b/pyproject.toml index 0a5f263..e81a18a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,6 @@ -[tool.pdm] - [project] name = "holophonor" -version = "0.1.0" +dynamic = ["version"] description = "Live looping, unlimited!" authors = [ {name = "Quaternion Media", email = "holophonor@quaternion.media"}, @@ -17,7 +15,12 @@ readme = "README.md" license = {text = "MIT"} [project.scripts] -holophonor = "holophonor.main:main" +holophonor = "holophonor.main.py" + + +[tool.pdm] +version = { source = "file", path = "holophonor/_version.py" } + [build-system] requires = ["pdm-backend"] From 03f19580bcbfeff80dcc4b4d15c7eb756757d43b Mon Sep 17 00:00:00 2001 From: Harpo Date: Mon, 15 Jan 2024 17:53:52 -0800 Subject: [PATCH 6/6] Fixes project script syntax --- pyproject.toml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e81a18a..3dca5dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,27 +2,31 @@ name = "holophonor" dynamic = ["version"] description = "Live looping, unlimited!" -authors = [ - {name = "Quaternion Media", email = "holophonor@quaternion.media"}, -] -dependencies = [ - "pluggy<1.1,>=1.0.0", - "python-rtmidi<1.5,>=1.4.9", - "loguru>=0.6.0", -] +authors = [{ name = "Quaternion Media", email = "holophonor@quaternion.media" }] +dependencies = ["pluggy~=1.0", "python-rtmidi~=1.4", "loguru~=0.6"] requires-python = ">=3.8.1, < 4" readme = "README.md" -license = {text = "MIT"} - -[project.scripts] -holophonor = "holophonor.main.py" - +license = { text = "MIT" } [tool.pdm] version = { source = "file", path = "holophonor/_version.py" } +[project.scripts] +holophonor = "holophonor.main:main" [build-system] requires = ["pdm-backend"] build-backend = "pdm.backend" +[tool.ruff] +ignore = [ + # line too long + "E501", + # Ambiguous variable names + "E741", + # imported but unused + "F401", + # star imports + "F403", + "F405", +]