Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BTrees
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
BTrees
Commits
2f7e7ae7
Commit
2f7e7ae7
authored
Mar 29, 2016
by
Forest Gregg
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/zopefoundation/BTrees
Conflicts: .travis.yml
parents
099a6b20
92cc2cc4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
.travis.yml
.travis.yml
+2
-3
CHANGES.rst
CHANGES.rst
+2
-0
setup.py
setup.py
+0
-2
tox.ini
tox.ini
+5
-5
No files found.
.travis.yml
View file @
2f7e7ae7
language
:
python
sudo
:
false
<<<<<<< HEAD
matrix
:
include
:
-
os
:
linux
python
:
2.6
-
os
:
linux
python
:
2.7
-
os
:
linux
...
...
@@ -30,7 +29,7 @@ before_install:
install
:
-
pip install .
script
:
-
python setup.py test -q
-
python setup.py
-q
test -q
notifications
:
email
:
false
after_success
:
...
...
CHANGES.rst
View file @
2f7e7ae7
...
...
@@ -4,6 +4,8 @@
4.3.0 (TBD)
-----------
- Drop support for Python 2.6 and 3.2.
- The pure-Python implementation, used on PyPy and when a C compiler
isn't available for CPython, now pickles identically to the C
version. Unpickling will choose the best available implementation.
...
...
setup.py
View file @
2f7e7ae7
...
...
@@ -122,10 +122,8 @@ setup(name='BTrees',
"License :: OSI Approved :: Zope Public License"
,
"Programming Language :: Python"
,
'Programming Language :: Python :: 2'
,
'Programming Language :: Python :: 2.6'
,
'Programming Language :: Python :: 2.7'
,
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3.2'
,
'Programming Language :: Python :: 3.3'
,
'Programming Language :: Python :: 3.4'
,
'Programming Language :: Python :: 3.5'
,
...
...
tox.ini
View file @
2f7e7ae7
...
...
@@ -2,8 +2,8 @@
envlist
=
# Jython support pending 2.7 support, due 2012-07-15 or so. See:
# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
# py2
6,py27,py32
,jython,pypy,coverage,docs
py2
6,py27,py27-pure,pypy,py32
,py33,py34,py35,pypy3,w_zodb,coverage,docs
# py2
7
,jython,pypy,coverage,docs
py2
7,py27-pure,pypy
,py33,py34,py35,pypy3,w_zodb,coverage,docs
[testenv]
deps
=
...
...
@@ -11,7 +11,7 @@ deps =
persistent
transaction
commands
=
python
setup.py
test
-q
python
setup.py
-q
test
-q
[testenv:py27-pure]
basepython
=
...
...
@@ -21,7 +21,7 @@ setenv =
deps
=
{
[testenv]
deps}
commands
=
python
setup.py
test
-q
python
setup.py
-q
test
-q
#[testenv:jython]
#commands =
...
...
@@ -31,7 +31,7 @@ commands =
basepython
=
python2.7
commands
=
python
setup.py
test
-q
python
setup.py
-q
test
-q
deps
=
zope.interface
persistent
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment