diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cb6ebcd4d..8d705bd621 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -180,24 +180,6 @@ jobs: paths: - "/home/circleci/.local" - compile_and_test - - run: - name: Install dependencies for wheel test - command: | - ARGO_NET_GIT_FETCH_WITH_CLI=1 pip install twine --user - # Remove tskit installed by msprime - pip uninstall tskit -y - - run: - name: Build Python package - command: | - cd python - rm -fR build - python -m pip install build - python -m venv venv - python -m build --sdist - python -m twine check dist/*.tar.gz - python -m build --wheel - pip install dist/*.whl - tskit --help build-32: docker: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c778a9728a..36f9622fc5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,10 +8,18 @@ on: env: FORCE_COLOR: 1 + jobs: pre-commit: name: Lint - uses: tskit-dev/.github/.github/workflows/lint.yml@v2 + uses: tskit-dev/.github/.github/workflows/lint.yml@v4 + + packaging: + name: Python packaging + uses: tskit-dev/.github/.github/workflows/python-packaging.yml@v4 + with: + working-directory: python + cli-test-cmd: tskit --help test: name: Python @@ -53,7 +61,7 @@ jobs: with: python-version: ${{ matrix.python }} version: "0.8.15" - + - name: Install dependencies working-directory: python run: | diff --git a/python/pyproject.toml b/python/pyproject.toml index bab789cf96..9a4af869e4 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -10,7 +10,7 @@ authors = [ ] description = "The tree sequence toolkit." readme = "README.rst" -license = {text = "MIT"} +license = "MIT" classifiers = [ "Programming Language :: C", "Programming Language :: Python", @@ -23,7 +23,6 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Other Environment", "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", "Operating System :: POSIX", "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows",