diff --git a/py2bit.h b/py2bit.h index b7f4a1b..bee30dc 100644 --- a/py2bit.h +++ b/py2bit.h @@ -1,7 +1,7 @@ #include #include "2bit.h" -#define pyTwoBitVersion "0.3.2" +#define pyTwoBitVersion "0.3.3" typedef struct { PyObject_HEAD diff --git a/pyproject.toml b/pyproject.toml index ae5db1e..a6d4a8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=42", "setuptools-scm"] +requires = ["setuptools>=74.1", "setuptools-scm"] build-backend = "setuptools.build_meta" [project] @@ -30,6 +30,12 @@ classifiers = [ download = "https://github.com/deeptools/py2bit" homepage = "https://github.com/deeptools/py2bit" +[tool.setuptools] +# Override setuptools autodiscovery algorithm +# Only include package test data/source for wheel distribution +include-package-data = true +packages = ["py2bitTest"] + # Enable version inference from scm [tool.setuptools_scm] diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index bc10a0a..7f91207 --- a/setup.py +++ b/setup.py @@ -1,9 +1,6 @@ -#!/usr/bin/env python -from setuptools import setup, Extension, find_packages -from distutils import sysconfig -import subprocess +from setuptools import setup, Extension import glob -import sys +import sysconfig srcs = [x for x in glob.glob("lib2bit/*.c")] @@ -16,27 +13,5 @@ library_dirs = additional_libs, include_dirs = ['lib2bit', sysconfig.get_config_var("INCLUDEPY")]) -setup(name = 'py2bit', - version = '0.3.3', - description = 'A package for accessing 2bit files using lib2bit', - author = "Devon P. Ryan", - author_email = "dpryan79@gmail.com", - url = "https://github.com/deeptools/py2bit", - license = "MIT", - download_url = "https://github.com/deeptools/py2bit", - keywords = ["bioinformatics", "2bit"], - classifier = ["Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved", - "Programming Language :: C", - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: Implementation :: CPython", - "Operating System :: POSIX", - "Operating System :: Unix", - "Operating System :: MacOS"], - packages = find_packages(), - include_package_data=True, - ext_modules = [module1]) +setup_args = dict(ext_modules=[module1]) +setup(**setup_args)