From dbfcb1d0b81c6cdc0c4191808cc3145735b44f4b Mon Sep 17 00:00:00 2001 From: Stephen Anyango Date: Tue, 21 Nov 2023 12:01:17 +0000 Subject: [PATCH] Update to packaging configuration `tools.setuptools` section has `include_package_data=True` by default. The `license` field requires specific license syntax ref: https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html --- manifest.in => MANIFEST.in | 2 +- pyproject.toml | 9 +++++++-- setup.py | 16 ---------------- 3 files changed, 8 insertions(+), 19 deletions(-) rename manifest.in => MANIFEST.in (64%) delete mode 100644 setup.py diff --git a/manifest.in b/MANIFEST.in similarity index 64% rename from manifest.in rename to MANIFEST.in index d84cc1a..eadcb8c 100644 --- a/manifest.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include fr3d/data/*.txt include fr3d/classifiers/*.html -include fr3d/classifiers/*.csv \ No newline at end of file +include fr3d/classifiers/*.csv diff --git a/pyproject.toml b/pyproject.toml index 9f51238..3aff1d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,14 +4,19 @@ build-backend = "setuptools.build_meta" [project] name = "fr3d" -version = "0.0.1" +version = "0.0.2" description = "Python implementation of FR3D" authors = [{name="Craig L. Zirbel and others", email="zirbel@bgsu.edu"}] - +license = { text = "Apache-2.0"} dependencies = [ "numpy", "scipy", "mmcif-pdbx; python_version>='3.0'" ] +[tools.setuptools] +packages = ["fr3d"] + + + diff --git a/setup.py b/setup.py deleted file mode 100644 index 2b5e8be..0000000 --- a/setup.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup, find_packages - -setup( - name='fr3d', - version='0.0.1', - packages=find_packages(include=['fr3d', 'fr3d.*']), - include_package_data=True, - url='', - license='LICENSE.txt', - install_requires=["numpy", "scipy", "mmcif-pdbx; python_version >= '3.0'"], - description='Python implementation of FR3D', - long_description="", - data_files=[('fr3d/data',['fr3d/data/atom_mappings.txt']),('fr3d/classifiers', ['fr3d/classifiers/template.html','fr3d/classifiers/H_bonding_Atoms_from_Isostericity_Table.csv'])] -)