Restructure source tree layout

Author: dalcinl

.mypy.ini

@@ -5,7 +5,7 @@ warn_unused_ignores = True
 warn_redundant_casts = True
 show_error_codes = True
 exclude = (?x)(
-  ^shmem4py/src/.*\.py$ |
+  ^src/.*\.py$ |
   ^demo/api/.*\.py$
   )
 

MANIFEST.in

@@ -1,2 +1,3 @@
-recursive-include demo *.py makfile
-recursive-include shmem4py/src *.h *.c *.py
+recursive-include demo *.py makefile
+recursive-include src  *.py *.h *.c
+recursive-include test *.sh

makefile

@@ -8,7 +8,7 @@ OSHRUN := $(firstword \
 
 .PHONY: build
 build:
-	$(PYTHON) setup.py $(opt) build build_ext --inplace
+	$(PYTHON) setup.py $(opt) build build_ext --inplace $(opt)
 
 .PHONY: test
 test:
@@ -20,8 +20,8 @@ test-%:
 
 .PHONY: lint
 lint:
-	-pycodestyle shmem4py
-	-flake8 shmem4py
+	-pycodestyle src/shmem4py
+	-flake8 src/shmem4py
 	-pylint shmem4py
 
 .PHONY: cover cover-html
@@ -36,14 +36,20 @@ cover-html: cover
 
 .PHONY: clean
 clean:
-	-$(RM) -r build shmem4py/*.so shmem4py.egg-info
+	-$(RM) -r build src/shmem4py/*.so src/shmem4py.egg-info
 	-$(RM) -r */__pycache__ */*/__pycache__
 	-$(RM) -r .coverage* htmlcov/
 	-$(RM) -r .mypy_cache
 
+.PHONY: develop develop-uninstall
+develop:
+	$(PYTHON) setup.py develop --prefix='' --user $(opt)
+develop-uninstall:
+	$(PYTHON) setup.py develop --prefix='' --user --uninstall $(opt)
+
 .PHONY: install uninstall
 install:
-	$(PYTHON) setup.py $(opt) install --prefix='' --user
+	$(PYTHON) setup.py $(opt) install --prefix='' --user $(opt)
 uninstall:
 	-$(RM) -r $(shell $(PYTHON) -m site --user-site)/shmem4py
 	-$(RM) -r $(shell $(PYTHON) -m site --user-site)/shmem4py-*-py*.egg-info

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools >= 40.9.0",
+    "setuptools >= 43",
     "wheel",
     "cffi >= 1.13",
 ]

setup.cfg

@@ -1,30 +1,37 @@
 [metadata]
 name = shmem4py
 version = attr: shmem4py.__version__
-license = BSD-2-Clause
 description = Python bindings for OpenSHMEM
 long_description = file: README.md
 long_description_content_type = text/markdown
+license = BSD-2-Clause
+license_files = LICENSE.md
 url = https://github.comm/mpi4py/shmem4py
 author = Lisandro Dalcin
 author_email = [email protected]
 
 [options]
+packages =
+    shmem4py
+package_dir =
+    =src
 setup_requires =
     cffi>=1.13
 install_requires =
     cffi>=1.13
     numpy>=1.12
 python_requires = >=3.7
-
-
-[flake8]
-exclude = shmem4py/src/*
+[options.package_data]
+shmem4py =
+    py.typed
+    api.pyi
 
 
 [coverage:run]
 parallel = True
 branch = True
 source = shmem4py
 [coverage:paths]
-source = */shmem4py
+source =
+  src/shmem4py
+  */shmem4py

setup.py

@@ -6,13 +6,14 @@
 Python bindings for OpenSHMEM
 """
 
-import sys, os
+import os
+import sys
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext as cmd_build_ext
 from setuptools.command.install   import install   as cmd_install
 
 topdir = os.path.abspath(os.path.dirname(__file__))
-sys.path.insert(0, os.path.join(topdir, 'shmem4py', 'src'))
+sys.path.insert(0, os.path.join(topdir, 'src'))
 
 class build_ext(cmd_build_ext, object):
     def build_extensions(self):
@@ -30,17 +31,8 @@ def run(self):
         super(install, self).run()
 
 setup(
-    packages = [
-        'shmem4py',
-    ],
-    package_data = {
-        'shmem4py' : [
-            'api.pyi',
-            'py.typed',
-        ],
-    },
     cffi_modules = [
-        'shmem4py/src/api_build.py:ffibuilder',
+        'src/ffibuilder.py:ffibuilder',
     ],
     cmdclass = {
         'build_ext': build_ext,

shmem4py/src/generate.py src/apicodegen.py

@@ -303,6 +303,5 @@ def generate():
 
 
 if __name__ == '__main__':
-    import os
     for code in generate():
         print(code.strip(), end='\n')

shmem4py/src/api_build.py src/ffibuilder.py

@@ -1,18 +1,20 @@
 import os
+import sys
 import glob
 import cffi
 
 srcdir = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(srcdir, "generate.py")) as h:
-    exec(h.read())
+if srcdir not in sys.path:
+    sys.path.insert(0, srcdir)
 
 
-def api_build(
+def build_api(
     module="api",
     shmem_h="shmem.h",
     shmem_ctx_t='...*',
     shmem_team_t='...*',
 ):
+    from apicodegen import generate
     ffi = cffi.FFI()
     with open(os.path.join(srcdir, "libshmem.h")) as h:
         code = h.read()
@@ -64,12 +66,17 @@ def api_build(
 
 
 def ffibuilder():
-    return api_build()
+    return build_api()
 
 
 if __name__ == '__main__':
     from fficompiler import fficompiler
     cc = fficompiler.search('OSHCC', 'oshcc')
     ld = fficompiler.search('OSHLD')
     with fficompiler(cc, ld):
-        ffibuilder().compile()
+        cwd = os.getcwd()
+        try:
+            os.chdir(srcdir)
+            ffibuilder().compile()
+        finally:
+            os.chdir(cwd)

shmem4py/src/fficompiler.py src/fficompiler.py

@@ -7,7 +7,7 @@ envlist =
     py310-npy{121,122}
     pypy37
     pypy38
-    #pypy39
+    pypy39
 
 [shmem]
 run = {env:OSHRUN:oshrun}
@@ -43,9 +43,9 @@ deps =
     flake8
     pylint
 commands =
-    pycodestyle shmem4py
-   #pydocstyle shmem4py
-    flake8 shmem4py
+    pycodestyle src/shmem4py
+   #pydocstyle src/shmem4py
+    flake8 src/shmem4py
    #pylint shmem4py
 
 
@@ -55,8 +55,8 @@ deps =
     numpy
     mypy
 commands =
-    mypy --python-version 3.7  shmem4py demo test
-    mypy --python-version 3.8  shmem4py demo test
-    mypy --python-version 3.9  shmem4py demo test
-    mypy --python-version 3.10 shmem4py demo test
-    mypy --python-version 3.11 shmem4py demo test
+    mypy --python-version 3.7  src/shmem4py demo test
+    mypy --python-version 3.8  src/shmem4py demo test
+    mypy --python-version 3.9  src/shmem4py demo test
+    mypy --python-version 3.10 src/shmem4py demo test
+    mypy --python-version 3.11 src/shmem4py demo test