You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/08/28 15:10:20 UTC

[tinkerpop] branch master updated (0606371 -> b992179)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from 0606371  Merge branch '3.4-dev'
     add dd012bb  pinned pyparsing - 3.0.x alpha releases seem to cause breaks in the build CTR
     new b992179  Merge branch '3.4-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gremlin-python/src/main/python/setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


[tinkerpop] 01/01: Merge branch '3.4-dev'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b992179b5ef4438c7833c0dd4281f9303e44d714
Merge: 0606371 dd012bb
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Aug 28 11:09:56 2020 -0400

    Merge branch '3.4-dev'

 gremlin-python/src/main/python/setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc gremlin-python/src/main/python/setup.py
index c53bca3,0000000..279120a
mode 100644,000000..100644
--- a/gremlin-python/src/main/python/setup.py
+++ b/gremlin-python/src/main/python/setup.py
@@@ -1,90 -1,0 +1,91 @@@
 +"""
 +Licensed to the Apache Software Foundation (ASF) under one
 +or more contributor license agreements.  See the NOTICE file
 +distributed with this work for additional information
 +regarding copyright ownership.  The ASF licenses this file
 +to you under the Apache License, Version 2.0 (the
 +"License"); you may not use this file except in compliance
 +with the License.  You may obtain a copy of the License at
 +
 +http://www.apache.org/licenses/LICENSE-2.0
 +
 +Unless required by applicable law or agreed to in writing,
 +software distributed under the License is distributed on an
 +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +KIND, either express or implied.  See the License for the
 +specific language governing permissions and limitations
 +under the License.
 +"""
 +import codecs
 +import os
 +import sys
 +import time
 +from setuptools import setup
 +
 +# Folder containing the setup.py
 +root = os.path.dirname(os.path.abspath(__file__))
 +
 +# Path to __version__ module
 +version_file = os.path.join(root, 'gremlin_python', '__version__.py')
 +
 +# Check if this is a source distribution.
 +# If not create the __version__ module containing the version
 +if not os.path.exists(os.path.join(root, 'PKG-INFO')):
 +    timestamp = int(os.getenv('TIMESTAMP', time.time() * 1000)) / 1000
 +    fd = codecs.open(version_file, 'w', 'utf-8')
 +    fd.write("'''")
 +    fd.write(__doc__)
 +    fd.write("'''\n")
 +    fd.write('version   = %r\n' % os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp))
 +    fd.write('timestamp = %d\n' % timestamp)
 +    fd.close()
 +# Load version
 +from gremlin_python import __version__
 +
 +version = __version__.version
 +
 +install_requires = [
 +    'aenum>=1.4.5,<3.0.0',
 +    'tornado>=4.4.1,<6.0',
 +    'six>=1.10.0,<2.0.0',
-     'isodate>=0.6.0,<1.0.0'
++    'isodate>=0.6.0,<1.0.0',
++    'pyparsing>=2.4.7,<3.0.0'
 +]
 +
 +if sys.version_info < (3, 2):
 +    install_requires += ['futures>=3.0.5,<4.0.0']
 +
 +if sys.version_info < (3, 5):
 +    install_requires += ['pyparsing>=2.4.6,<3.0.0']
 +
 +setup(
 +    name='gremlinpython',
 +    version=version,
 +    packages=['gremlin_python', 'gremlin_python.driver',
 +              'gremlin_python.driver.tornado', 'gremlin_python.process',
 +              'gremlin_python.structure', 'gremlin_python.structure.io'],
 +    license='Apache 2',
 +    url='http://tinkerpop.apache.org',
 +    description='Gremlin-Python for Apache TinkerPop',
 +    long_description=codecs.open("README.rst", "r", "UTF-8").read(),
 +    long_description_content_type='text/x-rst',
 +    test_suite="tests",
 +    data_files=[("", ["LICENSE", "NOTICE"])],
 +    setup_requires=[
 +        'pytest-runner',
 +    ],
 +    tests_require=[
 +        'pytest>=4.6.4,<5.0.0',
 +        'mock>=3.0.5,<4.0.0',
 +        'radish-bdd==0.8.6',
 +        'PyHamcrest>=1.9.0,<2.0.0'
 +    ],
 +    install_requires=install_requires,
 +    classifiers=[
 +        "Intended Audience :: Developers",
 +        "License :: OSI Approved :: Apache Software License",
 +        "Natural Language :: English",
 +        "Programming Language :: Python :: 3.4",
 +        "Programming Language :: Python :: 3.5",
 +    ]
 +)