Skip to content

Commit bfe21d1

Browse files
committed
update for enscons 0.4.0
1 parent 4fd9339 commit bfe21d1

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

SConstruct

+5-12
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ if sys.platform == 'win32':
3232
env = Environment(tools=['default', 'packaging', enscons.generate, enscons.cpyext.generate],
3333
PACKAGE_METADATA=metadata,
3434
WHEEL_TAG=full_tag,
35-
ROOT_IS_PURELIB=False,
3635
MSVC_VERSION=MSVC_VERSION,
3736
TARGET_ARCH=TARGET_ARCH)
3837

@@ -72,21 +71,15 @@ py_source = (Glob('cryptacular/*.py') +
7271
Glob('cryptacular/crypt/*.py') +
7372
Glob('cryptacular/pbkdf2/*.py'))
7473

75-
whl = env.Whl('platlib', py_source + extension, root='')
74+
platlib = env.Whl('platlib', py_source + extension, root='')
75+
whl = env.WhlFile(source=platlib)
7676

7777
# Add automatic source files, plus any other needed files.
78-
sdist_source=(FindSourceFiles() +
78+
sdist_source=list(set(FindSourceFiles() +
7979
['PKG-INFO', 'setup.py'] +
80-
Glob('crypt_blowfish-1.2/*', exclude=['crypt_blowfish-1.2/*.os']))
81-
82-
sdist = env.Package(
83-
NAME=env['PACKAGE_NAME'],
84-
VERSION=env['PACKAGE_METADATA']['version'],
85-
PACKAGETYPE='src_zip',
86-
source=sdist_source,
87-
target=['/'.join([env['DIST_BASE'], env['PACKAGE_NAME'] + '-' + env['PACKAGE_VERSION'] + '.zip'])],
88-
)
80+
Glob('crypt_blowfish-1.2/*', exclude=['crypt_blowfish-1.2/*.os'])))
8981

82+
sdist = env.SDist(source=sdist_source)
9083
env.Alias('sdist', sdist)
9184

9285
install = env.Command("#DUMMY", whl,

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist=py27,py35,pypy
33
[testenv]
44
deps=
5-
enscons
5+
enscons>=0.4.0
66
pytest
77
pytest-cov
88
nose

0 commit comments

Comments
 (0)