From d12611e1d016d73c65e3ca4b36becda8d8e89d93 Mon Sep 17 00:00:00 2001 From: Freddy Esteban Date: Wed, 15 Jan 2020 09:39:02 -0600 Subject: [PATCH 1/4] remove version number joined by dots, does not work well with release candidates. remove automatically upload to pypi. pymongo version bump. --- .circleci/config.yml | 26 +++----------------------- requirements/prod.txt | 2 +- setup.py | 3 +-- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32bfbff..b91fc36 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,34 +9,14 @@ jobs: - run: command: pip install --upgrade pip tox - - - run: - command: | - tox -e lint - tox -e py35 - - pypi_upload: - docker: - - image: python:3.5 - steps: - - checkout - run: command: | - pip install --upgrade pip tox - tox -e build_pypi + tox -e lint + tox -e py35 workflows: version: 2 test: jobs: - - test - pypi_upload: - jobs: - - pypi_upload: - filters: - tags: - only: - - /^[0-9]+.[0-9]+.[0-9]+$/ - branches: - ignore: /.*/ \ No newline at end of file + - test \ No newline at end of file diff --git a/requirements/prod.txt b/requirements/prod.txt index 2c773fd..8d8fe3f 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,5 +1,5 @@ elasticsearch>=2.0.0 -pymongo==3.7.2 +pymongo==3.8.0 redis>=2.0 requests>=2.0.0 six<2.0 diff --git a/setup.py b/setup.py index fca9571..eb55857 100755 --- a/setup.py +++ b/setup.py @@ -4,8 +4,7 @@ from setuptools import find_packages from setuptools import setup -VERSION = ('0', '5', '2') -__version__ = '.'.join(VERSION) +__version__ = '0.6.0rc0' with open('README.md') as f: readme = f.read() From 43adadd9070884de8c63749f3119286459ff9a72 Mon Sep 17 00:00:00 2001 From: Freddy Esteban Date: Wed, 15 Jan 2020 11:55:00 -0600 Subject: [PATCH 2/4] python bump in circleci config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b91fc36..3b046bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: test: docker: - - image: python:3.5 + - image: python:3.7 working_directory: ~/python-client steps: - checkout From c2fd4df6f700766c564e3281c2dcc25061e29272 Mon Sep 17 00:00:00 2001 From: Freddy Esteban Date: Wed, 15 Jan 2020 11:57:33 -0600 Subject: [PATCH 3/4] add py2 tests in circleci --- .circleci/config.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b046bd..ce4cf6b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,21 @@ version: 2 jobs: - test: + test-py2: + docker: + - image: python:2.7 + working_directory: ~/python-client + steps: + - checkout + + - run: + command: pip install --upgrade pip tox + + - run: + command: | + tox -e lint + tox -e py27 + + test-py3: docker: - image: python:3.7 working_directory: ~/python-client @@ -13,10 +28,11 @@ jobs: - run: command: | tox -e lint - tox -e py35 + tox -e py37 workflows: version: 2 test: jobs: - - test \ No newline at end of file + - test-py2 + - test-py3 \ No newline at end of file From 1c274f246838de842f79b388d341640b5c581684 Mon Sep 17 00:00:00 2001 From: Freddy Esteban Date: Wed, 15 Jan 2020 12:17:17 -0600 Subject: [PATCH 4/4] version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eb55857..2ebfc0f 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages from setuptools import setup -__version__ = '0.6.0rc0' +__version__ = '0.6.0' with open('README.md') as f: readme = f.read()