Skip to content

Commit

Permalink
Merge pull request #50 from kmpaul/master
Browse files Browse the repository at this point in the history
Updates for new release
  • Loading branch information
Kevin Paul authored Jul 30, 2020
2 parents 9564954 + 930b5b6 commit 27a4cfa
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 28 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,10 @@ venv.bak/
global.lock
purge.lock
/temp/
/dask-worker-space/

# VSCode files
.vscode/

# DevContainer extension files
.devcontainer/
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
repos:
- repo: https://github.com/ambv/black
rev: cad4138050b86d1c8570b926883e32f7465c2880
rev: 19.10b0
hooks:
- id: black
language_version: python3.7
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.2.3
language_version: python3.8
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
hooks:
- id: flake8
49 changes: 25 additions & 24 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import versioneer
import yaml

from six import string_types
from os.path import exists
from setuptools import setup

Expand All @@ -12,40 +11,42 @@ def environment_dependencies(obj, dependencies=None):
# if isinstance(obj, string_types):
# dependencies.append(obj.replace('=', '=='))
elif isinstance(obj, dict):
if 'dependencies' in obj:
environment_dependencies(obj['dependencies'], dependencies=dependencies)
elif 'pip' in obj:
environment_dependencies(obj['pip'], dependencies=dependencies)
if "dependencies" in obj:
environment_dependencies(obj["dependencies"], dependencies=dependencies)
elif "pip" in obj:
environment_dependencies(obj["pip"], dependencies=dependencies)
elif isinstance(obj, list):
for d in obj:
environment_dependencies(d, dependencies=dependencies)
return dependencies


with open('environment.yml') as f:
with open("environment.yml") as f:
install_requires = environment_dependencies(yaml.safe_load(f))

if exists('README.rst'):
with open('README.rst') as f:
if exists("README.rst"):
with open("README.rst") as f:
long_description = f.read()
else:
long_description = ''
long_description = ""

setup(name='dask-mpi',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description='Deploy Dask using mpi4py',
url='https://github.com/dask/dask-mpi', # TODO: Update to docs when docs complete
maintainer='Kevin Paul',
maintainer_email='[email protected]',
license='BSD 3-Clause',
include_package_data=True,
install_requires=install_requires,
python_requires=">=3.5",
packages=['dask_mpi'],
long_description=long_description,
entry_points="""
setup(
name="dask-mpi",
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description="Deploy Dask using mpi4py",
url="https://github.com/dask/dask-mpi", # TODO: Update to docs when docs complete
maintainer="Kevin Paul",
maintainer_email="[email protected]",
license="BSD 3-Clause",
include_package_data=True,
install_requires=install_requires,
python_requires=">=3.5",
packages=["dask_mpi"],
long_description=long_description,
entry_points="""
[console_scripts]
dask-mpi=dask_mpi.cli:go
""",
zip_safe=False)
zip_safe=False,
)

0 comments on commit 27a4cfa

Please sign in to comment.