Skip to content

Commit

Permalink
Merge branch 'hotfix/1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
iktakahiro committed Apr 9, 2016
2 parents b0cdea5 + 9b1d9c2 commit 5752fc9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2015 Takahiro Ikeuchi
Copyright (c) 2014-2016 Takahiro Ikeuchi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
__author__ = 'Takahiro Ikeuchi'

requires = ['requests']
test_requirements = ['requests', 'pytest']
tests_requires = ['requests', 'pytest']
extras_requires = {
':python_version<"3.4"': ["enum34"],
}

setup(
name="slackpy",
version="1.4.0",
version="1.4.1",
py_modules=['slackpy', 'commandline'],
package_dir={'': 'slackpy'},
install_requires=requires,
Expand All @@ -38,5 +38,5 @@
"slackpy=commandline:main",
],
},
tests_require=test_requirements
tests_require=tests_requires
)

0 comments on commit 5752fc9

Please sign in to comment.