Skip to content

Commit

Permalink
Updated packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurentRDC committed Nov 14, 2018
1 parent a2d6c62 commit 0774a5f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 40 deletions.
7 changes: 3 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
graft docs
graft tests

include AUTHORS.rst
include CHANGELOG.rst
include CONTRIBUTING.rst
include LICENSE
include README.rst
include requirements.txt
include dev-requirements.txt

include appveyor.yml
recursive-include crystals/cifs *.cif

global-exclude *.py[cod] __pycache__ *.so *.dylib
2 changes: 1 addition & 1 deletion crystals/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
__author__ = "Laurent P. René de Cotret"
__email__ = "laurent.renedecotret@mail.mcgill.ca"
__license__ = "BSD3"
__version__ = "0.3.0"
__version__ = "0.3.1"

from .atom import Atom
from .atom import frac_coords
Expand Down
32 changes: 1 addition & 31 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,32 +1,2 @@
[bdist_wheel]
universal = 0


[flake8]
max-line-length = 140
exclude = */migrations/*

[tool:pytest]
testpaths = tests
norecursedirs =
migrations

python_files =
test_*.py
*_test.py
tests.py
addopts =
-ra
--strict
--doctest-modules
--doctest-glob=\*.rst
--tb=short

[isort]
force_single_line = True
line_length = 120
known_first_party = crystals
default_section = THIRDPARTY
forced_separate = test_crystals
not_skip = __init__.py
skip = migrations
universal = 0
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
DOWNLOAD_URL = "http://github.com/LaurentRDC/crystals"
AUTHOR = "Laurent P. René de Cotret"
AUTHOR_EMAIL = "laurent.renedecotret@mail.mcgill.ca"
BASE_PACKAGE = "crystals"

CIF_FILES = chain.from_iterable([glob("crystals\\cifs\\*.cif")])

base_path = Path(__file__).parent
with open(base_path / BASE_PACKAGE / "__init__.py") as f:
with open(base_path / PACKAGE_NAME / "__init__.py") as f:
module_content = f.read()
VERSION = (
re.compile(r".*__version__ = \"(.*?)\"", re.S).match(module_content).group(1)
Expand Down Expand Up @@ -47,13 +46,13 @@
maintainer=AUTHOR,
maintainer_email=AUTHOR_EMAIL,
install_requires=REQUIREMENTS,
keywords=["crystallography"],
keywords=["crystallography", "material science", "structural biology"],
project_urls={
"Documentation": "https://crystals.readthedocs.io/",
"Source": "https://github.com/LaurentRDC/crystals",
},
python_requires=">=3.6",
packages=find_packages(PACKAGE_NAME),
packages=find_packages(),
data_files=[("crystals\\cifs", CIF_FILES)],
include_package_data=True,
zip_safe=False,
Expand Down

0 comments on commit 0774a5f

Please sign in to comment.