mirror of
https://github.com/sprockets/sprockets.clients.memcached.git
synced 2024-11-26 03:00:19 +00:00
Merge pull request #2 from dave-shawley/rm-python3-memcached
Remove python3 memcached
This commit is contained in:
Edward F. Long, Jr
GitHub
commit
6ba8b52020
12 changed files with 43 additions and 51 deletions
|
|
@ -2,17 +2,13 @@
|
|||
---
|
||||
language: python
|
||||
python:
|
||||
- 2.6
|
||||
- 2.7
|
||||
- pypy
|
||||
- 3.2
|
||||
- 3.3
|
||||
- 3.4
|
||||
install:
|
||||
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
|
||||
- if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install -r requirements2.txt; fi
|
||||
- if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then pip install -r requirements2.txt; fi
|
||||
- if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then pip install -r requirements3.txt; fi
|
||||
- pip install -e .
|
||||
- pip install -r test-requirements.txt
|
||||
script: nosetests
|
||||
after_success:
|
||||
|
|
|
|||
2
LICENSE
2
LICENSE
|
|
@ -1,4 +1,4 @@
|
|||
Copyright (c) 2014 AWeber Communications
|
||||
Copyright (c) 2014-2018 AWeber Communications
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
|
|
|
|||
|
|
@ -1,2 +1,5 @@
|
|||
include LICENSE
|
||||
include README.rst
|
||||
include requirements.txt
|
||||
include test-requirements.txt
|
||||
include dev-requirements.txt
|
||||
include tests.py
|
||||
|
|
|
|||
14
README.rst
14
README.rst
|
|
@ -2,7 +2,7 @@ sprockets.clients.memcached
|
|||
===========================
|
||||
Memcached client wrapper that is configured via environment variables.
|
||||
|
||||
|Version| |Downloads| |Status| |Coverage| |License|
|
||||
|Version| |Status| |Coverage| |License|
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
|
@ -20,8 +20,7 @@ https://sprocketsclientsmemcached.readthedocs.org
|
|||
|
||||
Requirements
|
||||
------------
|
||||
- `python-memcached <https://pypi.python.org/pypi/python-memcached>`_ (Python 2)
|
||||
- `python3-memcached <https://pypi.python.org/pypi/python3-memcached>`_ (Python 3)
|
||||
- `python-memcached <https://pypi.python.org/pypi/python-memcached>`_
|
||||
|
||||
Example
|
||||
-------
|
||||
|
|
@ -45,7 +44,7 @@ memcached commands:
|
|||
|
||||
Version History
|
||||
---------------
|
||||
Available at https://sprocketsclientsmemcached.readthedocs.org/en/latest/history.html
|
||||
Available at https://sprocketsclientsmemcached.readthedocs.io/en/latest/history.html
|
||||
|
||||
.. |Version| image:: https://badge.fury.io/py/sprockets.clients.memcached.svg?
|
||||
:target: http://badge.fury.io/py/sprockets.clients.memcached
|
||||
|
|
@ -56,8 +55,5 @@ Available at https://sprocketsclientsmemcached.readthedocs.org/en/latest/history
|
|||
.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.clients.memcached.svg?
|
||||
:target: https://coveralls.io/r/sprockets/sprockets.clients.memcached
|
||||
|
||||
.. |Downloads| image:: https://pypip.in/d/sprockets.clients.memcached/badge.svg?
|
||||
:target: https://pypi.python.org/pypi/sprockets.clients.memcached
|
||||
|
||||
.. |License| image:: https://pypip.in/license/sprockets.clients.memcached/badge.svg?
|
||||
:target: https://sprocketsclientsmemcached.readthedocs.org
|
||||
.. |License| image:: https://img.shields.io/github/license/sprockets/sprockets.clients.memcached.svg
|
||||
:target: https://sprocketsclientsmemcached.readthedocs.io
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
# Include this version only for documentation building purposes, normally ignored
|
||||
-e git://github.com/gmr/python-memcached.git@docstring-update#egg=python-memcached
|
||||
sphinx>=1.2,<2
|
||||
sphinx-rtd-theme>=0.1,<1.0
|
||||
sphinxcontrib-httpdomain>=1.2,<2
|
||||
|
|
|
|||
14
docs/conf.py
14
docs/conf.py
|
|
@ -1,8 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
import sphinx_rtd_theme
|
||||
|
||||
from sprockets.clients.memcached import version_info, __version__
|
||||
|
||||
needs_sphinx = '1.0'
|
||||
extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
|
|
@ -14,15 +12,11 @@ templates_path = []
|
|||
source_suffix = '.rst'
|
||||
master_doc = 'index'
|
||||
project = 'sprockets.clients.memcached'
|
||||
copyright = '2014, AWeber Communications'
|
||||
version = '.'.join(__version__.split('.')[0:1])
|
||||
release = __version__
|
||||
if len(version_info) > 3:
|
||||
release += '-{0}'.format(str(v) for v in version_info[3:])
|
||||
copyright = '2014-2018, AWeber Communications'
|
||||
version = '1.0.1'
|
||||
release = '1.0'
|
||||
exclude_patterns = []
|
||||
pygments_style = 'sphinx'
|
||||
html_theme = 'sphinx_rtd_theme'
|
||||
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
|
||||
intersphinx_mapping = {
|
||||
'python': ('https://docs.python.org/2/', None)
|
||||
}
|
||||
intersphinx_mapping = {'python': ('https://docs.python.org/2/', None)}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
Version History
|
||||
---------------
|
||||
- Next Release
|
||||
|
||||
- Remove usage of python3-memcached since python-memcached supports
|
||||
both Python2 & Python3
|
||||
- Drop support for Python 2.6
|
||||
|
||||
- 1.0.0 [2014-09-03]
|
||||
|
||||
- Initial release
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ sprockets.clients.memcached
|
|||
===========================
|
||||
Memcached client wrapper that is configured via environment variables
|
||||
|
||||
|Version| |Downloads| |Status| |Coverage| |License|
|
||||
|Version| |Status| |Coverage| |License|
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
|
@ -16,8 +16,7 @@ and can be installed via ``pip`` or ``easy_install``:
|
|||
|
||||
Requirements
|
||||
------------
|
||||
- `python-memcached <https://pypi.python.org/pypi/python-memcached>`_ (Python 2)
|
||||
- `python3-memcached <https://pypi.python.org/pypi/python3-memcached>`_ (Python 3)
|
||||
- `python-memcached <https://pypi.python.org/pypi/python-memcached>`_
|
||||
|
||||
API Documentation
|
||||
-----------------
|
||||
|
|
@ -26,6 +25,7 @@ API Documentation
|
|||
|
||||
api
|
||||
examples
|
||||
history
|
||||
|
||||
Version History
|
||||
---------------
|
||||
|
|
@ -59,8 +59,5 @@ Indices and tables
|
|||
.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.clients.memcached.svg?
|
||||
:target: https://coveralls.io/r/sprockets/sprockets.clients.memcached
|
||||
|
||||
.. |Downloads| image:: https://pypip.in/d/sprockets.clients.memcached/badge.svg?
|
||||
:target: https://pypi.python.org/pypi/sprockets.clients.memcached
|
||||
|
||||
.. |License| image:: https://pypip.in/license/sprockets.clients.memcached/badge.svg?
|
||||
:target: https://sprocketsclientsmemcached.readthedocs.org
|
||||
.. |License| image:: https://img.shields.io/github/license/sprockets/sprockets.clients.memcached.svg
|
||||
:target: https://sprocketsclientsmemcached.readthedocs.io
|
||||
|
|
|
|||
1
requirements.txt
Normal file
1
requirements.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
python-memcached>=1.59,<2
|
||||
|
|
@ -1 +0,0 @@
|
|||
python-memcached
|
||||
|
|
@ -1 +0,0 @@
|
|||
python3-memcached
|
||||
22
setup.py
22
setup.py
|
|
@ -3,12 +3,15 @@ import sys
|
|||
|
||||
import setuptools
|
||||
|
||||
install_requires = ['sprockets']
|
||||
|
||||
if sys.version_info < (3, 0):
|
||||
install_requires.append('python-memcached')
|
||||
if sys.version_info >= (3, 0):
|
||||
install_requires.append('python3-memcached')
|
||||
def read_requirements(name):
|
||||
requirements = []
|
||||
with open(name) as req_file:
|
||||
for line in req_file:
|
||||
if '#' in line:
|
||||
line = line[:line.index('#')]
|
||||
requirements.append(line.strip())
|
||||
return requirements
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
|
|
@ -22,13 +25,12 @@ setuptools.setup(
|
|||
author_email='api@aweber.com',
|
||||
license=codecs.open('LICENSE', encoding='utf-8').read(),
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Development Status :: 5 - Production',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: BSD License',
|
||||
'Natural Language :: English',
|
||||
'Operating System :: OS Independent',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.6',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.2',
|
||||
|
|
@ -44,7 +46,7 @@ setuptools.setup(
|
|||
'sprockets.clients.memcached'],
|
||||
package_data={'': ['LICENSE', 'README.rst']},
|
||||
include_package_data=True,
|
||||
namespace_packages=['sprockets',
|
||||
'sprockets.clients'],
|
||||
install_requires=install_requires,
|
||||
namespace_packages=['sprockets', 'sprockets.clients'],
|
||||
install_requires=read_requirements('requirements.txt'),
|
||||
tests_require=read_requirements('test-requirements.txt'),
|
||||
zip_safe=False)
|
||||
|
|
|
|||
Loading…
Reference in a new issue