Skip to content

Commit ee6cec0

Browse files
Package changes
1 parent 684907b commit ee6cec0

9 files changed

Lines changed: 61 additions & 17 deletions

File tree

.github/workflows/release_python_package_to_pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ jobs:
7373
env:
7474
BUILD_DIR: pmma/build
7575
LIB_DIR: pmma/lib
76-
TEMP_DIR: pmma/temporary
77-
CMAKE_TEMP_DIR: pmma/temporary/cmake
76+
TEMP_DIR: temporary
77+
CMAKE_TEMP_DIR: temporary/cmake
7878
VCPKG_DIR: build_tools/vcpkg
7979
VCPKG_CMAKE: build_tools/vcpkg/scripts/buildsystems/vcpkg.cmake
8080

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,10 @@ pmma/lib/*
180180
*.html
181181

182182
# Ignore everything in build_tools
183-
build_tools/*
183+
build_tools/*
184+
185+
# Ignore everything in temporary/
186+
temporary/*
187+
188+
# Ignore everything in pmma/extern
189+
pmma/extern/
File renamed without changes.

MANIFEST.in

Lines changed: 0 additions & 8 deletions
This file was deleted.

MODULE_MAKER.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
build_dir = os.path.join(cwd, "pmma", "build")
1414
lib_dir = os.path.join(cwd, "pmma", "lib")
1515
extern_dir = os.path.join(cwd, "pmma", "extern")
16-
temp_dir = os.path.join(cwd, "pmma", "temporary")
16+
temp_dir = os.path.join(cwd, "temporary")
1717
include_dir = os.path.join(cwd, "pmma", "core", "hpp_src")
1818
pyx_dir = os.path.join(cwd, "pmma", "core", "pyx_src")
1919
cmake_temp_dir = os.path.join(temp_dir, "cmake")

pmma/licenses/GLFW/LICENSE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2002-2006 Marcus Geelnard
2+
3+
Copyright (c) 2006-2019 Camilla Löwy
4+
5+
This software is provided 'as-is', without any express or implied
6+
warranty. In no event will the authors be held liable for any damages
7+
arising from the use of this software.
8+
9+
Permission is granted to anyone to use this software for any purpose,
10+
including commercial applications, and to alter it and redistribute it
11+
freely, subject to the following restrictions:
12+
13+
1. The origin of this software must not be misrepresented; you must not
14+
claim that you wrote the original software. If you use this software
15+
in a product, an acknowledgment in the product documentation would
16+
be appreciated but is not required.
17+
18+
2. Altered source versions must be plainly marked as such, and must not
19+
be misrepresented as being the original software.
20+
21+
3. This notice may not be removed or altered from any source
22+
distribution.

pmma/licenses/LICENSE.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
PMMA
2+
====
3+
4+
MIT License
5+
6+
Copyright (c) 2025 Thomas Jebson
7+
8+
Permission is hereby granted, free of charge, to any person obtaining a copy
9+
of this software and associated documentation files (the "Software"), to deal
10+
in the Software without restriction, including without limitation the rights
11+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
copies of the Software, and to permit persons to whom the Software is
13+
furnished to do so, subject to the following conditions:
14+
15+
The above copyright notice and this permission notice shall be included in all
16+
copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24+
SOFTWARE.

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sounddevice
1616
soundfile
1717
waiting
1818
watchdog
19-
wmi
2019

2120
# Windows-specific requirement
22-
pywin32; sys_platform == 'win32'
21+
pywin32; sys_platform == 'win32'
22+
wmi; sys_platform == 'win32'

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#type: ignore
22

3-
from setuptools import setup, Extension, find_packages
3+
from setuptools import setup, Extension
44
from Cython.Build import cythonize
55
import sys, os
66
import platform
@@ -121,7 +121,7 @@ def make_ext(name, extra_cpp=None, add_numpy=False):
121121
packages = []
122122
def list_dirs(root_dir):
123123
for dirpath, dirnames, _ in os.walk(root_dir):
124-
if not "temporary" in dirpath:
124+
if not (dirpath in ["temporary", "pyx_src", "cpp_src", "hpp_src"]):
125125
package = "pmma." + dirpath.replace(root_dir, "").replace(os.sep, ".")[1:]
126126
if package == "pmma.":
127127
package = "pmma"
@@ -130,7 +130,7 @@ def list_dirs(root_dir):
130130

131131
setup(
132132
name="pmma",
133-
version="5.0.6",
133+
version="5.0.7",
134134
author="PycraftDev",
135135
author_email="thomasjebbo@gmail.com",
136136
description="Python Multi-Media API (PMMA) is a multi-purpose API designed to make working on multi-media projects easier and faster!",

0 commit comments

Comments
 (0)