Skip to content

Commit

Permalink
Merge pull request #80 from bobleesj/remove-old-files
Browse files Browse the repository at this point in the history
Remove old files (gitarchive, gitattributes, devutils), standardize pyproject.toml, MANIFEST
  • Loading branch information
sbillinge authored Sep 23, 2024
2 parents 5923fa2 + c0ed31b commit 2d439b6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 102 deletions.
5 changes: 0 additions & 5 deletions .gitarchive.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .gitattributes

This file was deleted.

40 changes: 12 additions & 28 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,28 +1,12 @@
recursive-include src/diffpy *
recursive-exclude src/diffpy *.py[co] *.so
recursive-include docs *.rst conf.py Makefile make.bat

recursive-include src/extensions/libpdffit2 *.[ch]*
recursive-include src/extensions/pdffit2module *.[ch]*
recursive-include src/examples *
include AUTHORS.rst
include diffpy.pdffit2/version.py
include LICENSE.rst
include README.rst
include requirements/
prune src/extensions/libpdffit2/tests
global-exclude .gitattributes .gitignore .gitarchive.cfg
global-exclude .DS_Store
recursive-exclude * __pycache__
recursive-exclude * *.py[co]

# If including data files in the package, add them like:
# include path/to/data_file

# Avoid user content in setup.cfg to make distribution reproducible.
exclude setup.cfg

# Exclude git-tracked files spuriously added by setuptools_scm
exclude .coveragerc
prune devutils
prune doc
graft src
graft tests
graft requirements

include AUTHORS.rst LICENSE*.rst README.rst

# Exclude all bytecode files and __pycache__ directories
global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files.
global-exclude .DS_Store # Exclude Mac filesystem artifacts.
global-exclude __pycache__ # Exclude Python cache directories.
global-exclude .git* # Exclude git files and directories.
global-exclude .idea # Exclude PyCharm project settings.
60 changes: 0 additions & 60 deletions devutils/makesdist

This file was deleted.

7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
requires = ["setuptools>=62.0", "setuptools-git-versioning<2"]
requires = ["setuptools>=62.0", "setuptools-git-versioning>=2.0"]
build-backend = "setuptools.build_meta"

[project]
name = "diffpy.pdffit2"
dynamic=['version']
dynamic=['version', 'dependencies']
authors = [
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
]
Expand Down Expand Up @@ -48,6 +48,9 @@ include = ["*"] # package names should match these glob patterns (["*"] by defa
exclude = ["diffpy.pdffit2.tests*"] # exclude packages matching these glob patterns (empty by default)
namespaces = false # to disable scanning PEP 420 namespaces (true by default)

[tool.setuptools.dynamic]
dependencies = {file = ["requirements/run.txt"]}

[tool.black]
line-length = 115
include = '\.pyi?$'
Expand Down

0 comments on commit 2d439b6

Please sign in to comment.