Skip to content
This repository was archived by the owner on Mar 26, 2024. It is now read-only.

Commit 3c25d65

Browse files
Matthew BryanGitHub Enterprise
authored andcommitted
Merge pull request #2 from dtucker/carepackaging
Add various structural and packaging improvements
2 parents ec44fda + 3b0c9a0 commit 3c25d65

27 files changed

+148
-6
lines changed

.gitignore

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
src/combtest/version.py
2+
3+
# Byte-compiled / optimized / DLL files
4+
__pycache__/
5+
*.py[cod]
6+
*$py.class
7+
8+
# C extensions
9+
*.so
10+
11+
# Distribution / packaging
12+
.Python
13+
build/
14+
develop-eggs/
15+
dist/
16+
downloads/
17+
eggs/
18+
.eggs/
19+
lib/
20+
lib64/
21+
parts/
22+
sdist/
23+
var/
24+
wheels/
25+
pip-wheel-metadata/
26+
share/python-wheels/
27+
*.egg-info/
28+
.installed.cfg
29+
*.egg
30+
MANIFEST
31+
32+
# PyInstaller
33+
# Usually these files are written by a python script from a template
34+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
35+
*.manifest
36+
*.spec
37+
38+
# Installer logs
39+
pip-log.txt
40+
pip-delete-this-directory.txt
41+
42+
# Unit test / coverage reports
43+
htmlcov/
44+
.tox/
45+
.nox/
46+
.coverage
47+
.coverage.*
48+
.cache
49+
nosetests.xml
50+
coverage.xml
51+
*.cover
52+
.hypothesis/
53+
.pytest_cache/
54+
55+
# Translations
56+
*.mo
57+
*.pot
58+
59+
# Django stuff:
60+
*.log
61+
local_settings.py
62+
db.sqlite3
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
target/
76+
77+
# Jupyter Notebook
78+
.ipynb_checkpoints
79+
80+
# IPython
81+
profile_default/
82+
ipython_config.py
83+
84+
# pyenv
85+
.python-version
86+
87+
# pipenv
88+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
89+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
90+
# having no cross-platform support, pipenv may install dependencies that don’t work, or not
91+
# install all needed dependencies.
92+
#Pipfile.lock
93+
94+
# celery beat schedule file
95+
celerybeat-schedule
96+
97+
# SageMath parsed files
98+
*.sage.py
99+
100+
# Environments
101+
.env
102+
.venv
103+
env/
104+
venv/
105+
ENV/
106+
env.bak/
107+
venv.bak/
108+
109+
# Spyder project settings
110+
.spyderproject
111+
.spyproject
112+
113+
# Rope project settings
114+
.ropeproject
115+
116+
# mkdocs documentation
117+
/site
118+
119+
# mypy
120+
.mypy_cache/
121+
.dmypy.json
122+
dmypy.json
123+
124+
# Pyre type checker
125+
.pyre/

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
graft src
12
include version.py

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ['setuptools ~= 41.0.0']
3+
build-backend = 'setuptools.build_meta'

setup.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Provides __version__
66
exec(open('version.py').read())
77

8-
from setuptools import setup, Command
8+
from setuptools import setup, find_packages, Command
99

1010

1111
class CleanCommand(Command):
@@ -40,18 +40,19 @@ def run(self):
4040
include_package_data=True,
4141
author_email='matthew.bryan@isilon.com',
4242
url='https://github.west.com/mbryan/py-combtest',
43-
packages=[
44-
'combtest',
45-
'combtest.test.',
46-
'combtest.test.classes',
47-
],
43+
package_dir={'': 'src'},
44+
packages=find_packages('src'),
45+
python_requires='>=2.7,!=3.0,!=3.1,!=3.2,!=3.3,!=3.4,<4',
4846
install_requires=requirements,
4947
keywords='combtest',
5048
classifiers=[
5149
'Development Status :: 2 - Pre-Alpha',
5250
'Intended Audience :: Developers',
5351
'Natural Language :: English',
5452
'Programming Language :: Python :: 2.7',
53+
'Programming Language :: Python :: 3.5',
54+
'Programming Language :: Python :: 3.6',
55+
'Programming Language :: Python :: 3.7',
5556
],
5657
cmdclass={
5758
'clean': CleanCommand,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)