Fix tarball and wheel (#295)

* add tarball test and factor out pypi GHA

* fix wheel

* pre-commit

.github/workflows/ci.yaml

@@ -57,20 +57,3 @@ jobs:
         env_vars: OS,PYTHON
         name: codecov-umbrella
         fail_ci_if_error: false
-
-  distribution:
-    runs-on: ubuntu-latest
-    needs: [pytest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build distributions
-      run: |
-        $CONDA/bin/python -m pip install build
-        $CONDA/bin/python -m build
-    - name: Publish a Python distribution to PyPI
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/pypi.yml

@@ -0,0 +1,52 @@
+name: Publish to PyPI
+
+on:
+  pull_request:
+  push:
+    branches:
+    - main
+  release:
+    types:
+    - published
+
+jobs:
+  packages:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+
+    - name: Get tags
+      run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      shell: bash
+
+    - name: Install build tools
+      run: |
+        python -m pip install --upgrade pip wheel setuptools setuptools_scm build twine
+      shell: bash
+
+    - name: Build binary wheel
+      run: python -m build --sdist --wheel . --outdir dist
+
+    - name: CheckFiles
+      run: |
+        ls dist
+      shell: bash
+
+    - name: Test wheels
+      run: |
+        cd dist && python -m pip install oceanspy*.whl
+        python -m twine check *
+        python -c "import oceanspy; print(f'oceanspy v{oceanspy.__version__}')"
+      shell: bash
+
+    - name: Publish a Python distribution to PyPI
+      if: success() && github.event_name == 'release'
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

MANIFEST.in

@@ -1,11 +1,15 @@
-include AUTHORS.rst
 include CONTRIBUTING.rst
 include HISTORY.rst
-include LICENSE
 include README.rst
+include LICENSE
+
+graft oceanspy
 
-recursive-include oceanspy/tests *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
+prune assets
+prune docs
+prune binder
+prune paper
+prune sciserver_catalogs/
+prune *.egg-info
 
 recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif

pyproject.toml

@@ -36,7 +36,7 @@ testpaths = ["oceanspy/tests"]
 addopts = "-v --cov"
 
 [tool.setuptools]
-py-modules = ["oceanspy"]
+packages = ["oceanspy"]
 
 [tool.setuptools_scm]
 write_to = "oceanspy/version.py"