Skip to content

Commit 085747a

Browse files
author
Ryan P Kilby
committed
Update packaging/testing paths
1 parent c9d9f90 commit 085747a

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/coverage/
99
/build/
1010
/dist/
11-
/*.egg-info/
11+
*.egg-info/
1212
/env/
1313
MANIFEST
1414
coverage.*

MANIFEST.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include README.md
22
include LICENSE.md
3-
recursive-include rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff
4-
recursive-include rest_framework/templates *.html schema.js
3+
recursive-include src/rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff
4+
recursive-include src/rest_framework/templates *.html schema.js
55
global-exclude __pycache__
66
global-exclude *.py[co]

runtests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
'fast': ['tests', '--tb=short', '-q', '-s', '-rw'],
1313
}
1414

15-
FLAKE8_ARGS = ['rest_framework', 'tests']
15+
FLAKE8_ARGS = ['src/rest_framework', 'tests']
1616

17-
ISORT_ARGS = ['--recursive', '--check-only', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests']
17+
ISORT_ARGS = ['--recursive', '--check-only', '-o' 'uritemplate', '-p', 'tests', 'src/rest_framework', 'tests']
1818

1919
sys.path.append(os.path.dirname(__file__))
2020

@@ -97,7 +97,7 @@ def is_class(string):
9797
'--cov-report',
9898
'xml',
9999
'--cov',
100-
'rest_framework'] + pytest_args
100+
'src/rest_framework'] + pytest_args
101101

102102
if first_arg.startswith('-'):
103103
# `runtests.py [flags]`

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_version(package):
2828
return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
2929

3030

31-
version = get_version('rest_framework')
31+
version = get_version('src/rest_framework')
3232

3333

3434
if sys.argv[-1] == 'publish':
@@ -59,7 +59,8 @@ def get_version(package):
5959
long_description=read_md('README.md'),
6060
author='Tom Christie',
6161
author_email='[email protected]', # SEE NOTE BELOW (*)
62-
packages=find_packages(exclude=['tests*']),
62+
packages=find_packages('src'),
63+
package_dir={'': 'src'},
6364
include_package_data=True,
6465
install_requires=[],
6566
zip_safe=False,

0 commit comments

Comments
 (0)