diff --git a/.github/workflows/build-to-release.yml b/.github/workflows/build-to-release.yml index 3182d3187..0d6bf9f97 100644 --- a/.github/workflows/build-to-release.yml +++ b/.github/workflows/build-to-release.yml @@ -1,44 +1,42 @@ name: Build new release and publish to PyPI -on: +on: push: - branches: ['release'] + branches: ["release"] workflow_dispatch: - jobs: build: name: Build distribution from release branch runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - ref: 'release' - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.10" - - - name: Install pypa/build - run: >- - python3 -m pip install build --user - - - name: Build a binary wheel and a source tarball - run: python3 -m build - - - name: Store the distribution packages - uses: actions/upload-artifact@v4 - with: - name: python-package-distributions - path: dist/ + - uses: actions/checkout@v4 + with: + ref: "release" + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install pypa/build + run: >- + python3 -m pip install build --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + + - name: Store the distribution packages + uses: actions/upload-artifact@v4 + with: + name: python-package-distributions + path: dist/ publish-to-testpypi: name: Publish dist to TestPyPI needs: - - build + - build runs-on: ubuntu-latest environment: @@ -46,24 +44,23 @@ jobs: url: https://test.pypi.org/p/aepsych permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing + id-token: write # IMPORTANT: mandatory for trusted publishing steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: python-package-distributions - path: dist/ - - - name: Publish dis to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Publish dis to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ test-dist: name: Test distribtion from TestPyPI - needs: + needs: - publish-to-testpypi strategy: fail-fast: true @@ -73,41 +70,35 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - with: - ref: 'release' - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple "aepsych[dev]" - - - name: Test with unittest - run: | - python -m unittest - + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple "aepsych" + + - name: Check if python is importable + run: | + python -c "import aepsych" publish-to-pypi: - name: >- - Publish dist to PyPI - if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes + name: Publish dist to PyPI needs: - - test-dist + - test-dist runs-on: ubuntu-latest environment: name: pypi url: https://pypi.org/p/aepsych permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing + id-token: write # IMPORTANT: mandatory for trusted publishing steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: python-package-distributions - path: dist/ - - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..4bca2785a --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include Readme.md \ No newline at end of file diff --git a/aepsych/version.py b/aepsych/version.py index a6421b4d5..89bef4d5b 100644 --- a/aepsych/version.py +++ b/aepsych/version.py @@ -5,4 +5,4 @@ # This source code is licensed under the license found in the # LICENSE file in the root directory of this source tree. -__version__ = "0.4.1" +__version__ = "0.4.4"