diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 321a6d0..98d46d7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,11 +19,12 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel twine - - name: Build and publish + python -m pip install setuptools build twine + - name: Build + run: make build python=python + - name: Publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python setup.py sdist bdist_wheel - twine upload dist/* + make upload python=python diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f0cdc3..01c7070 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,14 +25,13 @@ jobs: activate-environment: rmsd-dev environment-file: environment.yml python-version: ${{ matrix.python-version }} - - run: | - ls - pwd - which python - conda info - run: pip install . - run: which calculate_rmsd - run: | make test python=python - run: | make format python=python + - run: | + make build python=python + make test-dist python=python + pip install dist/* diff --git a/Makefile b/Makefile index faa083c..2b3f0d4 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,6 @@ types: cov: ${python} -m pytest --cov=${package} --cov-config .coveragerc --cov-report html tests -compile: - ${python} _compile.py - build: ${python} -m build --sdist --skip-dependency-check .