Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 56 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: 2
jobs:
test:
docker:
- image: python:3.5
working_directory: ~/python-client
steps:
- checkout

- run:
command: pip install --upgrade pip tox

- run:
command: |
tox -e lint
tox -e py35

pypi_upload:
docker:
- image: circleci/python:3.5
steps:
- run:
command: tox -e build_pypi

pypi_upload_rc:
docker:
- image: circleci/python:3.5
steps:
- run:
command: tox -e build_testpypi

workflows:
version: 2
test:
jobs:
- test
pypi_upload:
jobs:
- pypi_upload:
requires:
- test
filters:
tags:
only:
- /^[0-9]+.[0-9]+.[0-9]+$/

- pypi_upload_rc:
requires:
- test
filters:
tags:
only:
- /^[0-9]+.[0-9]+.[0-9]+-rc[0-9]+$/



31 changes: 0 additions & 31 deletions circle.yml

This file was deleted.

2 changes: 1 addition & 1 deletion objectrocket/instances/mongodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def _compile_new_relic_stats(self, stats_this_second, stats_next_second):
first_doc = stats_this_second['aggregate_server_statistics'][subdoc]
second_doc = stats_next_second['aggregate_server_statistics'][subdoc]
keys = set(first_doc.keys()) | set(second_doc.keys())
server_statistics_per_second[subdoc] = {key: int(second_doc[key]) - int(first_doc[key]) for key in keys}
server_statistics_per_second[subdoc] = {key: int(second_doc[key]) - int(first_doc[key]) for key in keys if isinstance(first_doc[key], int)}
for node1, node2 in zip(stats_this_second['opcounters_per_node'], stats_next_second['opcounters_per_node']):
node_opcounters_per_second = {}
for repl, members in node2.items():
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ flake8>=2.1.0
mock>=1.0.1
pytest>=2.5.2
pytest-cov>=1.7.0
setuptools>=2.1
setuptools==40.2.0
sphinx_rtd_theme
tox>=2.1
wheel>=0.22.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from setuptools import find_packages
from setuptools import setup

VERSION = ('0', '4', '9')
VERSION = ('0', '4', '10')
__version__ = '.'.join(VERSION)

with open('README.md') as f:
Expand Down