Move Python package to new layout

.github/workflows/python.yaml

@@ -44,9 +44,10 @@ jobs:
       - name: Run doctests
         if: success() && matrix.python-version == '3.10'
         run: |
-          # Needs editable install to run --doctest-modules
-          pip install -e python
-          pytest python --doctest-modules
+          pytest --pyargs geoarrow --doctest-modules
+          # No Cython docs yet
+          # pip install pytest-cython
+          # pytest --pyargs geoarrow --doctest-cython
 
       - name: Coverage
         if: success() && matrix.python-version == '3.10'
@@ -57,10 +58,11 @@ jobs:
           pushd python
 
           # Build with Cython + gcc coverage options
+          pip install -e .[test]
           GEOARROW_COVERAGE=1 python3 setup.py build_ext --inplace
 
           # Run tests + coverage.py (generates .coverage + coverage.xml files)
-          python -m pytest --cov ./geoarrow
+          python -m pytest --cov ./src/geoarrow
           python -m coverage xml
 
           # Collect C coverage information
@@ -69,7 +71,7 @@ jobs:
             --exclude "/usr/*" \
             --exclude "/Library/*" \
             --exclude "*/_lib.cpp" \
-            --exclude "*/geoarrow/geoarrow/*" \
+            --exclude "*/src/geoarrow/geoarrow/*" \
             --output-file=coverage.info
 
           lcov --list coverage.info

python/.gitignore

@@ -16,8 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-geoarrow/geoarrow
-geoarrow/_lib.cpp
+src/geoarrow/geoarrow
+src/geoarrow/_lib.cpp
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

python/MANIFEST.in

@@ -16,5 +16,5 @@
 # under the License.
 
 exclude bootstrap.py
-include geoarrow/geoarrow/*.h
-include geoarrow/geoarrow/*.hpp
+include src/geoarrow/geoarrow/*.h
+include src/geoarrow/geoarrow/*.hpp

python/bootstrap.py

@@ -21,7 +21,7 @@
 
 if __name__ == '__main__':
     this_dir = os.path.abspath(os.path.dirname(__file__))
-    vendor_dir = os.path.join(this_dir, 'geoarrow', 'geoarrow')
+    vendor_dir = os.path.join(this_dir, 'src', 'geoarrow', 'geoarrow')
     vendor_source_dir = os.path.join(this_dir, '..', 'src', 'geoarrow')
 
     if os.path.exists(vendor_dir):

python/pyproject.toml

@@ -18,18 +18,18 @@
 
 [project]
 name = "geoarrow"
-version = "1.0.0-alpha0"
+version = "0.1.0-alpha0"
 description = ""
 authors = [{name = "Dewey Dunnington", email = "[email protected]"}]
 license = {text = "Apache-2.0"}
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-test = ["pyarrow", "pytest", "pandas", "numpy", "geopandas"]
+test = ["pyarrow<13.0.0", "pytest", "pandas", "numpy", "geopandas"]
 
 [project.urls]
 homepage = "https://arrow.apache.org"
-repository = "https://github.com/geoarrow/geoarrow-cpp"
+repository = "https://github.com/geoarrow/geoarrow-c"
 
 [build-system]
 requires = [

python/setup.py

@@ -31,9 +31,9 @@
 if os.path.exists(bootstrap_py):
     subprocess.run([sys.executable, bootstrap_py])
 
-vendor_dir = os.path.join(this_dir, 'geoarrow', 'geoarrow')
+vendor_dir = os.path.join(this_dir, 'src', 'geoarrow', 'geoarrow')
 vendored_files = os.listdir(vendor_dir)
-sources = [f'geoarrow/geoarrow/{f}' for f in vendored_files if f.endswith('.c')]
+sources = [f'src/geoarrow/geoarrow/{f}' for f in vendored_files if f.endswith('.c')]
 
 # Workaround because setuptools has no easy way to mix C and C++ sources
 # if extra flags are required (e.g., -std=c++11 like we need here).
@@ -64,9 +64,9 @@ def new__compile(obj, src, ext, cc_args, extra_postargs, pp_opts):
     ext_modules=[
         Extension(
             name='geoarrow._lib',
-            include_dirs=['geoarrow/geoarrow', 'geoarrow/geoarrow_python'],
+            include_dirs=['src/geoarrow/geoarrow', 'src/geoarrow/geoarrow_python'],
             language='c++',
-            sources=['geoarrow/_lib.pyx'] + sources,
+            sources=['src/geoarrow/_lib.pyx'] + sources,
             extra_compile_args = ['-std=c++11'] + coverage_compile_args,
             extra_link_args = [] + coverage_link_args,
             define_macros= [] + coverage_define_macros