Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated yaml code to support 5.1 #35

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Updated yaml code to support 5.1 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
language: python
cache: pip

before_install:
- sudo apt-get install rabbitmq-server

addons:
apt:
update: true
packages:
- rabbitmq-server

python:
- 2.7
Expand Down
2 changes: 1 addition & 1 deletion kiwipy/rmq/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
TASK_PREFETCH_COUNT = 0

ENCODER = partial(yaml.dump, encoding='utf-8')
DECODER = yaml.load
DECODER = partial(yaml.load, Loader=yaml.Loader)
111 changes: 54 additions & 57 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,57 @@
with open('kiwipy/version.py') as f:
exec(f.read(), about)

setup(
name="kiwipy",
version=about['__version__'],
description='A python remote communications library',
long_description=open('README.rst').read(),
url='https://github.com/muhrin/kiwipy.git',
author='Martin Uhrin',
author_email='martin.uhrin@gmail.com',
license=__license__,
classifiers=[
'Development Status :: 4 - Beta',
'License :: OSI Approved :: MIT License',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
keywords='communication messaging rpc broadcast',
install_requires=[
'six',
'shortuuid',
'typing; python_version<"3.5"',
'enum34; python_version<"3.4"',
'backports.tempfile; python_version<"3.2"',
'futures; python_version == "2.7"',
],
extras_require={
'rmq': [
'pika>=1.0.0b2',
'topika>=0.2.0, <0.3.0',
'tornado<6; python_version<"3"',
'tornado<5; python_version>="3"',
'pyyaml'
],
'dev': [
'pip',
'pre-commit',
'pytest>=4',
'pytest-cov',
'ipython<6',
'twine',
'yapf',
'prospector',
'pylint<2; python_version<"3"',
'pylint; python_version>="3"',
],
"docs": [
"Sphinx==1.8.4",
"Pygments==2.3.1",
"docutils==0.14",
],
},
packages=['kiwipy', 'kiwipy.rmq'],
test_suite='test')
setup(name="kiwipy",
version=about['__version__'],
description='A python remote communications library',
long_description=open('README.rst').read(),
url='https://github.com/muhrin/kiwipy.git',
author='Martin Uhrin',
author_email='martin.uhrin@gmail.com',
license=__license__,
classifiers=[
'Development Status :: 4 - Beta',
'License :: OSI Approved :: MIT License',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
keywords='communication messaging rpc broadcast',
install_requires=[
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're at it, do you want to specify python_requires here? This allows pip to install the correct version once support for a specific Python version is dropped (but needs to be in a release before it is dropped).

See e.g.: aiidateam/aiida-core#3574

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

'six',
'shortuuid',
'typing; python_version<"3.5"',
'enum34; python_version<"3.4"',
'backports.tempfile; python_version<"3.2"',
'futures; python_version == "2.7"',
],
python_requires=">=2.7,!=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
extras_require={
'rmq': [
'pika>=1.0.0', 'topika>=0.2.0, <0.3.0', 'tornado<6; python_version<"3"', 'tornado<5; python_version>="3"',
'pyyaml'
],
'dev': [
'pip',
'pre-commit',
'pytest>=4',
'pytest-cov',
'ipython<6',
'twine',
'yapf',
'prospector<1.1.7',
'pylint<2; python_version<"3"',
'pylint; python_version>="3"',
],
"docs": [
"Sphinx==1.8.4",
"Pygments==2.3.1",
"docutils==0.14",
],
},
packages=['kiwipy', 'kiwipy.rmq'],
test_suite='test')