Skip to content

Commit 27a4cfa

Browse files
author
Kevin Paul
authored
Merge pull request #50 from kmpaul/master
Updates for new release
2 parents 9564954 + 930b5b6 commit 27a4cfa

File tree

3 files changed

+36
-28
lines changed

3 files changed

+36
-28
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,10 @@ venv.bak/
114114
global.lock
115115
purge.lock
116116
/temp/
117+
/dask-worker-space/
118+
119+
# VSCode files
120+
.vscode/
121+
122+
# DevContainer extension files
123+
.devcontainer/

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
22
- repo: https://github.com/ambv/black
3-
rev: cad4138050b86d1c8570b926883e32f7465c2880
3+
rev: 19.10b0
44
hooks:
55
- id: black
6-
language_version: python3.7
7-
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v1.2.3
6+
language_version: python3.8
7+
- repo: https://gitlab.com/pycqa/flake8
8+
rev: 3.8.3
99
hooks:
1010
- id: flake8

setup.py

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import versioneer
22
import yaml
33

4-
from six import string_types
54
from os.path import exists
65
from setuptools import setup
76

@@ -12,40 +11,42 @@ def environment_dependencies(obj, dependencies=None):
1211
# if isinstance(obj, string_types):
1312
# dependencies.append(obj.replace('=', '=='))
1413
elif isinstance(obj, dict):
15-
if 'dependencies' in obj:
16-
environment_dependencies(obj['dependencies'], dependencies=dependencies)
17-
elif 'pip' in obj:
18-
environment_dependencies(obj['pip'], dependencies=dependencies)
14+
if "dependencies" in obj:
15+
environment_dependencies(obj["dependencies"], dependencies=dependencies)
16+
elif "pip" in obj:
17+
environment_dependencies(obj["pip"], dependencies=dependencies)
1918
elif isinstance(obj, list):
2019
for d in obj:
2120
environment_dependencies(d, dependencies=dependencies)
2221
return dependencies
2322

2423

25-
with open('environment.yml') as f:
24+
with open("environment.yml") as f:
2625
install_requires = environment_dependencies(yaml.safe_load(f))
2726

28-
if exists('README.rst'):
29-
with open('README.rst') as f:
27+
if exists("README.rst"):
28+
with open("README.rst") as f:
3029
long_description = f.read()
3130
else:
32-
long_description = ''
31+
long_description = ""
3332

34-
setup(name='dask-mpi',
35-
version=versioneer.get_version(),
36-
cmdclass=versioneer.get_cmdclass(),
37-
description='Deploy Dask using mpi4py',
38-
url='https://github.com/dask/dask-mpi', # TODO: Update to docs when docs complete
39-
maintainer='Kevin Paul',
40-
maintainer_email='kpaul@ucar.edu',
41-
license='BSD 3-Clause',
42-
include_package_data=True,
43-
install_requires=install_requires,
44-
python_requires=">=3.5",
45-
packages=['dask_mpi'],
46-
long_description=long_description,
47-
entry_points="""
33+
setup(
34+
name="dask-mpi",
35+
version=versioneer.get_version(),
36+
cmdclass=versioneer.get_cmdclass(),
37+
description="Deploy Dask using mpi4py",
38+
url="https://github.com/dask/dask-mpi", # TODO: Update to docs when docs complete
39+
maintainer="Kevin Paul",
40+
maintainer_email="kpaul@ucar.edu",
41+
license="BSD 3-Clause",
42+
include_package_data=True,
43+
install_requires=install_requires,
44+
python_requires=">=3.5",
45+
packages=["dask_mpi"],
46+
long_description=long_description,
47+
entry_points="""
4848
[console_scripts]
4949
dask-mpi=dask_mpi.cli:go
5050
""",
51-
zip_safe=False)
51+
zip_safe=False,
52+
)

0 commit comments

Comments
 (0)