Skip to content

Commit

Permalink
Merge branch 'master' into python-3.12-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuzu-Typ authored Oct 29, 2023
2 parents 829c316 + 2b0b1da commit c08f646
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 15 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@
path = glm
url = https://github.com/Zuzu-Typ/glm
branch = PyGLM
[submodule "pyglm-typing"]
path = pyglm-typing
url = https://github.com/esoma/pyglm-typing
1 change: 0 additions & 1 deletion pyglm-typing
Submodule pyglm-typing deleted from f47636
12 changes: 1 addition & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from codecs import open
from os import path

import re, os, shutil
import re

module1 = Extension('glm',
sources = ['PyGLM.cpp'], include_dirs=["glm/"], extra_compile_args=['-std=c++11'])
Expand All @@ -29,16 +29,6 @@
long_description = f.read()
long_description = long_description.replace("\r", "")

# Update glm-stubs
shutil.copy2("pyglm-typing/src/glm_typing/__init__.py", "glm-stubs/glm_typing.py")
shutil.copy2("pyglm-typing/src/glm-stubs/__init__.py", "glm-stubs")
with open(path.join(here, "pyglm-typing/src/glm-stubs/__init__.pyi"), encoding="utf-8") as f:
typing_data = f.read()

out_file = open(path.join(here, "glm-stubs/__init__.pyi"), "w", encoding="utf-8")
out_file.write(typing_data.replace("import glm_typing", "from . import glm_typing"))
out_file.close()


setup(
name='PyGLM',
Expand Down

0 comments on commit c08f646

Please sign in to comment.