From a72c592134ceeb098a7907352d75d664c027b6a9 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Wed, 20 Jan 2021 14:21:58 +0900 Subject: [PATCH 01/37] update 3.9 in test --- .circleci/config.yml | 68 +++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7306b94a..09ff7de7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,6 +126,11 @@ jobs: environment: PYTHON_PATH: /opt/python/cp38-cp38 + test-linux-39: + <<: *linux-test-template + environment: + PYTHON_PATH: /opt/python/cp39-cp39 + test-linux32-35: <<: *linux-test-template docker: @@ -153,6 +158,13 @@ jobs: - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest environment: PYTHON_PATH: /opt/python/cp38-cp38 + + test-linux32-39: + <<: *linux-test-template + docker: + - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + environment: + PYTHON_PATH: /opt/python/cp39-cp39 deploy-linux: &deploy-linux-template docker: @@ -320,6 +332,12 @@ jobs: environment: PYTHON: 3.8.0 HOMEBREW_NO_AUTO_UPDATE: 1 + + test-osx-39: + <<: *test-osx-template + environment: + PYTHON: 3.9.1 + HOMEBREW_NO_AUTO_UPDATE: 1 deploy-osx-36: &deploy-osx-template macos: @@ -426,7 +444,7 @@ jobs: choco install -y cmake if [ $PYTHON != '3.7.3' ]; then - choco install -y python --version "${PYTHON}" + choco install -y python --version "${PYTHON}" fi - run: @@ -453,6 +471,12 @@ jobs: PYTHON: 3.8.5 PYTHON_PATH: C:/Python38/ + test-win-39: + <<: *test-win-template + environment: + PYTHON: 3.9.1 + PYTHON_PATH: C:/Python39/ + test-win-35: <<: *test-win-template environment: @@ -512,27 +536,31 @@ jobs: workflows: tests: jobs: - - test-linux-doctest + #- test-linux-doctest - - test-osx-35 - - test-osx-36 - - test-osx-37 - - test-osx-38 + #- test-osx-35 + #- test-osx-36 + #- test-osx-37 + #- test-osx-38 + - test-osx-39 - - test-win-35 - - test-win-36 - - test-win-37 - - test-win-38 - - - test-linux-35 - - test-linux-36 - - test-linux-37 - - test-linux-38 - - - test-linux32-35 - - test-linux32-36 - - test-linux32-37 - - test-linux32-38 + #- test-win-35 + #- test-win-36 + #- test-win-37 + #- test-win-38 + - test-win-39 + + #- test-linux-35 + #- test-linux-36 + #- test-linux-37 + #- test-linux-38 + - test-linux-39 + + #- test-linux32-35 + #- test-linux32-36 + #- test-linux32-37 + #- test-linux32-38 + - test-linux32-39 deploy: jobs: From 51ad12a9732c14e89bedf675bc5a1beb46be7e96 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Wed, 20 Jan 2021 14:28:29 +0900 Subject: [PATCH 02/37] add brew update --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09ff7de7..e90f9bbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -267,6 +267,7 @@ jobs: command: | brew --version brew install cmake + brew update && brew upgrade pyenv brew install pyenv - restore_cache: From 03643effb1ec600e2799a3c9c5dfe5b70ecbf4e7 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Wed, 20 Jan 2021 16:17:16 +0900 Subject: [PATCH 03/37] use scikit build for linux --- .circleci/config.yml | 34 +++++++++++++++++----------------- setup.py | 16 +++++++++++----- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e90f9bbc..678165d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: test-linux-36: &linux-test-template docker: - - image: pyqubo/manylinux_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_x86_64:latest environment: PYTHON_PATH: /opt/python/cp36-cp36m @@ -134,35 +134,35 @@ jobs: test-linux32-35: <<: *linux-test-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest environment: PYTHON_PATH: /opt/python/cp35-cp35m test-linux32-36: <<: *linux-test-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest environment: PYTHON_PATH: /opt/python/cp36-cp36m test-linux32-37: <<: *linux-test-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest environment: PYTHON_PATH: /opt/python/cp37-cp37m test-linux32-38: <<: *linux-test-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest environment: PYTHON_PATH: /opt/python/cp38-cp38 test-linux32-39: <<: *linux-test-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest environment: PYTHON_PATH: /opt/python/cp39-cp39 @@ -267,7 +267,7 @@ jobs: command: | brew --version brew install cmake - brew update && brew upgrade pyenv + brew update brew install pyenv - restore_cache: @@ -543,24 +543,24 @@ workflows: #- test-osx-36 #- test-osx-37 #- test-osx-38 - - test-osx-39 + #- test-osx-39 #- test-win-35 #- test-win-36 #- test-win-37 #- test-win-38 - - test-win-39 + #- test-win-39 - #- test-linux-35 - #- test-linux-36 - #- test-linux-37 - #- test-linux-38 + - test-linux-35 + - test-linux-36 + - test-linux-37 + - test-linux-38 - test-linux-39 - #- test-linux32-35 - #- test-linux32-36 - #- test-linux32-37 - #- test-linux32-38 + - test-linux32-35 + - test-linux32-36 + - test-linux32-37 + - test-linux32-38 - test-linux32-39 deploy: diff --git a/setup.py b/setup.py index 564952c1..d7b76497 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from setuptools import Command -if os.getenv('READTHEDOCS'): +if os.getenv('READTHEDOCS') or platform.system() == "Linux": from skbuild import setup else: from setuptools import setup @@ -101,14 +101,19 @@ def run(self): packages = ['pyqubo', 'pyqubo.integer', 'pyqubo.utils'] install_requires = [ - 'numpy>=1.16.0,<2.0.0', - 'dimod>=0.9.2', - 'dwave-neal>=0.5.4', + 'numpy<1.20,>=1.17.3', + 'dimod>=0.9.13', + 'dwave-neal>=0.5.7', 'Deprecated>=1.2.10', 'six>=1.11.0' ] -python_requires = '>=3.5' +setup_requires = [ + 'scikit-build>=0.11.1', + 'cmake>=3.18.2' +] + +python_requires = '>=3.5, <3.10' setup( name=package_info.__package_name__, @@ -134,6 +139,7 @@ def run(self): 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'License :: OSI Approved :: Apache Software License', ] ) From 53dc98fe355800c79dd0671f9ea00d511d1d4ed4 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Wed, 20 Jan 2021 16:27:23 +0900 Subject: [PATCH 04/37] add scikit-buid and cmake to requirements.txt --- requirements.txt | 10 ++++++---- setup.py | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index c77f354c..91bcb27d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,9 @@ -dimod==0.9.2 -numpy==1.18.2 +#dimod==0.9.13 +#numpy==1.18.2 coverage==4.5.1 codecov==2.1.9 -dwave-neal==0.5.4 +#dwave-neal==0.5.7 Deprecated==1.2.10 -nbsphinx==0.3.5 \ No newline at end of file +nbsphinx==0.3.5 +scikit-build>=0.11.1 +cmake>=3.18.2 \ No newline at end of file diff --git a/setup.py b/setup.py index d7b76497..ede8161e 100644 --- a/setup.py +++ b/setup.py @@ -108,10 +108,6 @@ def run(self): 'six>=1.11.0' ] -setup_requires = [ - 'scikit-build>=0.11.1', - 'cmake>=3.18.2' -] python_requires = '>=3.5, <3.10' From ebbbe5cd65c5ee4782ee345d215f04f663511564 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 00:16:08 +0900 Subject: [PATCH 05/37] use bdist_wheel instead of pip wheel --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 678165d4..741498ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,7 +197,8 @@ jobs: echo $PYBIN if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 9))"; then continue; fi; "${PYBIN}/pip" install -r requirements.txt - "${PYBIN}/pip" wheel . -w ./wheelhouse + #"${PYBIN}/pip" wheel . -w ./wheelhouse + "${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse "${PYBIN}/python" setup.py sdist -d ./dist done From 8ec7bd8707176092a7634fcff03463285a1d422a Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 00:52:25 +0900 Subject: [PATCH 06/37] add packages to requirements.txt --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 91bcb27d..88c8d367 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -#dimod==0.9.13 -#numpy==1.18.2 +dimod==0.9.13 +numpy==1.18.2 coverage==4.5.1 codecov==2.1.9 -#dwave-neal==0.5.7 +dwave-neal==0.5.7 Deprecated==1.2.10 nbsphinx==0.3.5 scikit-build>=0.11.1 From f65e9cf86e7ace55600e6fb950dd44fdc3367648 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 01:18:23 +0900 Subject: [PATCH 07/37] test osx --- .circleci/config.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 741498ef..24b62a1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -540,11 +540,11 @@ workflows: jobs: #- test-linux-doctest - #- test-osx-35 - #- test-osx-36 - #- test-osx-37 - #- test-osx-38 - #- test-osx-39 + - test-osx-35 + - test-osx-36 + - test-osx-37 + - test-osx-38 + - test-osx-39 #- test-win-35 #- test-win-36 @@ -552,17 +552,17 @@ workflows: #- test-win-38 #- test-win-39 - - test-linux-35 - - test-linux-36 - - test-linux-37 - - test-linux-38 - - test-linux-39 - - - test-linux32-35 - - test-linux32-36 - - test-linux32-37 - - test-linux32-38 - - test-linux32-39 + #- test-linux-35 + #- test-linux-36 + #- test-linux-37 + #- test-linux-38 + #- test-linux-39 + + #- test-linux32-35 + #- test-linux32-36 + #- test-linux32-37 + #- test-linux32-38 + #- test-linux32-39 deploy: jobs: From 6921a4eba11695616a717103f54232ca6aacfb14 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 01:19:32 +0900 Subject: [PATCH 08/37] update HOMEBREW_NO_AUTO_UPDATE --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24b62a1e..2563c602 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -268,7 +268,6 @@ jobs: command: | brew --version brew install cmake - brew update brew install pyenv - restore_cache: @@ -339,7 +338,7 @@ jobs: <<: *test-osx-template environment: PYTHON: 3.9.1 - HOMEBREW_NO_AUTO_UPDATE: 1 + HOMEBREW_NO_AUTO_UPDATE: 0 deploy-osx-36: &deploy-osx-template macos: @@ -540,9 +539,9 @@ workflows: jobs: #- test-linux-doctest - - test-osx-35 - - test-osx-36 - - test-osx-37 + #- test-osx-35 + #- test-osx-36 + #- test-osx-37 - test-osx-38 - test-osx-39 From c902f927cc58d7f30bd6944eab9db551fd82c455 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 01:30:00 +0900 Subject: [PATCH 09/37] update brew --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2563c602..e598d4d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -266,6 +266,7 @@ jobs: - run: &install-cmake-pyenv name: install cmake and pyenv command: | + if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version brew install cmake brew install pyenv From 10f5a7dcf748620fb6fcdbf576df5d15b5297bad Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 01:56:20 +0900 Subject: [PATCH 10/37] update pyenv --- .circleci/config.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e598d4d9..ac278002 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,27 +263,27 @@ jobs: steps: - checkout - - run: &install-cmake-pyenv + - run: &install-cmake name: install cmake and pyenv command: | - if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version brew install cmake - brew install pyenv - restore_cache: keys: - - v1-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - - run: + - run: &install-pyenv name: install python command: | + if [ $PYTHON = 3.9.1 ]; then brew update; fi + brew install pyenv pyenv install $PYTHON -s - save_cache: paths: - ~/.pyenv - key: v1-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + key: v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &create-virtualenv-using-pyenv name: create virtualenv @@ -355,22 +355,18 @@ jobs: steps: - checkout - - run: *install-cmake-pyenv + - run: *install-cmake - restore_cache: keys: - - v1-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - - run: - name: install python - command: | - pyenv install -l - pyenv install $PYTHON -s + - run: *install-pyenv - save_cache: paths: - ~/.pyenv - key: v1-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + key: v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - run: *create-virtualenv-using-pyenv From 0f192cc5f0091bc36bd81b72fb99dc554e10c889 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 02:00:29 +0900 Subject: [PATCH 11/37] pyenv update --- .circleci/config.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac278002..e76ccfd5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -273,12 +273,22 @@ jobs: keys: - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - - run: &install-pyenv + - run: &install-python name: install python command: | - if [ $PYTHON = 3.9.1 ]; then brew update; fi brew install pyenv + git clone https://github.com/pyenv/pyenv-update.git $(pyenv root)/plugins/pyenv-update + pyenv update pyenv install $PYTHON -s + + #DIR="~/.pyenv/versions/3.9.1" + #if [ -d "$DIR" ]; then + # echo "Python 3.9.1 is already installed" + #else + # if [ $PYTHON = 3.9.1 ]; then brew update; fi + # brew install pyenv + # pyenv install $PYTHON -s + #fi - save_cache: paths: @@ -361,7 +371,7 @@ jobs: keys: - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - - run: *install-pyenv + - run: *install-python - save_cache: paths: From 1629f5e555bfd7eb928442389233b9be75860a02 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 02:10:55 +0900 Subject: [PATCH 12/37] update pyenv --- .circleci/config.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e76ccfd5..b13d7933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -264,7 +264,7 @@ jobs: - checkout - run: &install-cmake - name: install cmake and pyenv + name: install cmake command: | brew --version brew install cmake @@ -276,19 +276,17 @@ jobs: - run: &install-python name: install python command: | - brew install pyenv - git clone https://github.com/pyenv/pyenv-update.git $(pyenv root)/plugins/pyenv-update - pyenv update - pyenv install $PYTHON -s + #brew install pyenv + #git clone https://github.com/pyenv/pyenv-update.git $(pyenv root)/plugins/pyenv-update + #pyenv update + #pyenv install $PYTHON -s - #DIR="~/.pyenv/versions/3.9.1" - #if [ -d "$DIR" ]; then - # echo "Python 3.9.1 is already installed" - #else - # if [ $PYTHON = 3.9.1 ]; then brew update; fi - # brew install pyenv - # pyenv install $PYTHON -s - #fi + DIR="~/.pyenv/versions/"$PYTHON + if [!-d "$DIR" ]; then + if [ $PYTHON = 3.9.1 ]; then brew update; fi + brew install pyenv + pyenv install $PYTHON -s + fi - save_cache: paths: From d8af61c8668e77e3e09b93d2332c1fcd42ae8b83 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 02:17:37 +0900 Subject: [PATCH 13/37] update pyenv --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b13d7933..1daa38f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -271,7 +271,7 @@ jobs: - restore_cache: keys: - - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + - v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &install-python name: install python @@ -284,14 +284,14 @@ jobs: DIR="~/.pyenv/versions/"$PYTHON if [!-d "$DIR" ]; then if [ $PYTHON = 3.9.1 ]; then brew update; fi - brew install pyenv - pyenv install $PYTHON -s fi + brew install pyenv + if [!-d "$DIR" ]; then pyenv install $PYTHON -s; fi - save_cache: paths: - ~/.pyenv - key: v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + key: v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &create-virtualenv-using-pyenv name: create virtualenv @@ -367,14 +367,14 @@ jobs: - restore_cache: keys: - - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + - v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - run: *install-python - save_cache: paths: - ~/.pyenv - key: v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + key: v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - run: *create-virtualenv-using-pyenv From 9cb5f0adb9f9ca0826477dfe27ebef14c608cf4d Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 02:31:08 +0900 Subject: [PATCH 14/37] test pyenv --- .circleci/config.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1daa38f8..5b399d28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,6 +263,14 @@ jobs: steps: - checkout + - run: &brew-update + name: brew update + command: | + brew --version + brew install cmake + if [ $PYTHON = 3.9.1 ]; then brew update; fi + echo $(brew --cache) + - run: &install-cmake name: install cmake command: | @@ -276,17 +284,8 @@ jobs: - run: &install-python name: install python command: | - #brew install pyenv - #git clone https://github.com/pyenv/pyenv-update.git $(pyenv root)/plugins/pyenv-update - #pyenv update - #pyenv install $PYTHON -s - - DIR="~/.pyenv/versions/"$PYTHON - if [!-d "$DIR" ]; then - if [ $PYTHON = 3.9.1 ]; then brew update; fi - fi brew install pyenv - if [!-d "$DIR" ]; then pyenv install $PYTHON -s; fi + pyenv install $PYTHON -s - save_cache: paths: From 9fa087f4f8e9b34098f5721073a55b9691818925 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 02:39:34 +0900 Subject: [PATCH 15/37] update pyenv --- .circleci/config.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b399d28..c874a3d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,19 +263,28 @@ jobs: steps: - checkout - - run: &brew-update - name: brew update + - run: &install-cmake + name: install cmake command: | brew --version brew install cmake - if [ $PYTHON = 3.9.1 ]; then brew update; fi - echo $(brew --cache) - - run: &install-cmake - name: install cmake + - restore_cache: + keys: + - v1-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + + - run: &brew-update + name: brew update command: | brew --version - brew install cmake + if [ $PYTHON = 3.9.1 ]; then brew update; fi + brew --version + echo $(brew --cache) + + - save_cache: + paths: + - /Users/distiller/Library/Caches/Homebrew/ + key: v1-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - restore_cache: keys: From fade9b900398025625f59ffe6dfa3498ea4fd5a4 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:02:14 +0900 Subject: [PATCH 16/37] which python --- .circleci/config.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c874a3d0..9fa9b3ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -269,10 +269,6 @@ jobs: brew --version brew install cmake - - restore_cache: - keys: - - v1-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - - run: &brew-update name: brew update command: | @@ -280,11 +276,6 @@ jobs: if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version echo $(brew --cache) - - - save_cache: - paths: - - /Users/distiller/Library/Caches/Homebrew/ - key: v1-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - restore_cache: keys: @@ -306,6 +297,7 @@ jobs: command: | eval "$(pyenv init -)" pyenv local $PYTHON + which python python -m pip install virtualenv python -m virtualenv env @@ -556,7 +548,7 @@ workflows: #- test-osx-36 #- test-osx-37 - test-osx-38 - - test-osx-39 + #- test-osx-39 #- test-win-35 #- test-win-36 From e5a434d5047c876569022d43f35ef03124cc3515 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:11:02 +0900 Subject: [PATCH 17/37] save cache --- .circleci/config.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fa9b3ce..c01e420a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -275,22 +275,21 @@ jobs: brew --version if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version - echo $(brew --cache) + brew install pyenv - restore_cache: keys: - - v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + - v4-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &install-python name: install python command: | - brew install pyenv pyenv install $PYTHON -s - save_cache: paths: - ~/.pyenv - key: v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + key: v4-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &create-virtualenv-using-pyenv name: create virtualenv @@ -367,14 +366,14 @@ jobs: - restore_cache: keys: - - v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + - v4-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - run: *install-python - save_cache: paths: - ~/.pyenv - key: v3-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 + key: v4-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.0 - run: *create-virtualenv-using-pyenv From e3752d633e4877c83c4d1c1cfe4b379649876411 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:24:56 +0900 Subject: [PATCH 18/37] use cache --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c01e420a..18210600 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -546,8 +546,8 @@ workflows: #- test-osx-35 #- test-osx-36 #- test-osx-37 - - test-osx-38 - #- test-osx-39 + #- test-osx-38 + - test-osx-39 #- test-win-35 #- test-win-36 From c9b8dc14e17520e197867143ab4ae23992338637 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:36:05 +0900 Subject: [PATCH 19/37] save brew cache --- .circleci/config.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18210600..d0956ef0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,11 +263,11 @@ jobs: steps: - checkout - - run: &install-cmake - name: install cmake - command: | - brew --version - brew install cmake + - save_cache: + key: v4-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + paths: + - /Users/distiller/Library/Caches/Homebrew + - /usr/local/Homebrew - run: &brew-update name: brew update @@ -275,6 +275,16 @@ jobs: brew --version if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version + + - restore_cache: + keys: + - v4-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + + - run: &install-cmake + name: install cmake + command: | + brew --version + brew install cmake brew install pyenv - restore_cache: From eb4fdf608f7b5bd337b1f41bde5f204b88bcf41a Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:37:25 +0900 Subject: [PATCH 20/37] save brew cache --- .circleci/config.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0956ef0..93196992 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,11 +263,9 @@ jobs: steps: - checkout - - save_cache: - key: v4-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - paths: - - /Users/distiller/Library/Caches/Homebrew - - /usr/local/Homebrew + - restore_cache: + keys: + - v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &brew-update name: brew update @@ -275,11 +273,14 @@ jobs: brew --version if [ $PYTHON = 3.9.1 ]; then brew update; fi brew --version - - - restore_cache: - keys: - - v4-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - + + - save_cache: + key: v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + paths: + - /Users/distiller/Library/Caches/Homebrew + - /usr/local/Homebrew + + - run: &install-cmake name: install cmake command: | From 3e2dfd61742ea0908755ce37940da2b186411a6b Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 03:46:27 +0900 Subject: [PATCH 21/37] fix save cache --- .circleci/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93196992..185db6aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -280,7 +280,6 @@ jobs: - /Users/distiller/Library/Caches/Homebrew - /usr/local/Homebrew - - run: &install-cmake name: install cmake command: | @@ -373,6 +372,18 @@ jobs: steps: - checkout + - restore_cache: + keys: + - v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + + - run: *brew-update + + - save_cache: + key: v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + paths: + - /Users/distiller/Library/Caches/Homebrew + - /usr/local/Homebrew + - run: *install-cmake - restore_cache: From c8341d76962a4de2f081b8f25e40e1964b6d368e Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 04:18:52 +0900 Subject: [PATCH 22/37] use cache --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 185db6aa..fed9bdf9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -271,7 +271,10 @@ jobs: name: brew update command: | brew --version - if [ $PYTHON = 3.9.1 ]; then brew update; fi + brew_version="$(brew -v)" | head -n 1 | awk '{print $2}' + if [ $PYTHON = 3.9.1 -a $brew_version = 2.1.16 ]; then + brew update + fi brew --version - save_cache: From 83c485f5467968abd2c04692a8ca6394ae79f49d Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 04:22:03 +0900 Subject: [PATCH 23/37] fix brew_version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fed9bdf9..5d008df7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -271,7 +271,7 @@ jobs: name: brew update command: | brew --version - brew_version="$(brew -v)" | head -n 1 | awk '{print $2}' + brew_version=`echo "$(brew -v)" | head -n 1 | awk '{print $2}'` if [ $PYTHON = 3.9.1 -a $brew_version = 2.1.16 ]; then brew update fi From b36a12cb335060b03018e0974e65536448eb10bb Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 04:25:06 +0900 Subject: [PATCH 24/37] cache test --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d008df7..8397bcae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ jobs: - restore_cache: keys: - - v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + - v6-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: &brew-update name: brew update @@ -278,7 +278,7 @@ jobs: brew --version - save_cache: - key: v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + key: v6-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 paths: - /Users/distiller/Library/Caches/Homebrew - /usr/local/Homebrew From a22d4ec41360c197f142b9047fbdfb091bbd6abf Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 11:29:39 +0900 Subject: [PATCH 25/37] test deploy osx --- .circleci/config.yml | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8397bcae..42deccdc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,7 @@ jobs: - run: &install-dependencies-template name: install dependencies command: | + # Install dependencies such that pre-release versions are not installed when executing `setup.py install` . env/bin/activate python --version pip install -r requirements.txt @@ -168,7 +169,7 @@ jobs: deploy-linux: &deploy-linux-template docker: - - image: pyqubo/manylinux_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_x86_64:latest environment: GIT_URL: << pipeline.project.git_url >> @@ -181,6 +182,7 @@ jobs: - run: name: checkout directory command: | + # For the bug of CircleCI that checkout doesn't work when the tag is added echo $GIT_URL echo $GIT_REVISION echo $GIT_TAG @@ -195,7 +197,7 @@ jobs: command: | for PYBIN in /opt/python/*/bin; do echo $PYBIN - if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 9))"; then continue; fi; + if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 10))"; then continue; fi; "${PYBIN}/pip" install -r requirements.txt #"${PYBIN}/pip" wheel . -w ./wheelhouse "${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse @@ -220,11 +222,11 @@ jobs: echo -e "username = $PYPI_USERNAME" >> ~/.pypirc # for testpypi - #echo -e "repository = https://test.pypi.org/legacy/" >> ~/.pypirc - #echo -e "password = $TEST_PYPI_PASSWORD" >> ~/.pypirc + echo -e "repository = https://test.pypi.org/legacy/" >> ~/.pypirc + echo -e "password = $TEST_PYPI_PASSWORD" >> ~/.pypirc # for actual pypi - echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc + #echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc - run: name: python setup @@ -245,7 +247,7 @@ jobs: deploy-linux32: <<: *deploy-linux-template docker: - - image: pyqubo/manylinux1_i686_cmake_wo_ssh:latest + - image: quay.io/pypa/manylinux1_i686:latest ################################################################################################## # Mac OSX @@ -270,6 +272,9 @@ jobs: - run: &brew-update name: brew update command: | + # Only when the brew is not updated and Python=3.9, we update the brew + # since the older pyenv doesn't contain Python3.9. + brew --version brew_version=`echo "$(brew -v)" | head -n 1 | awk '{print $2}'` if [ $PYTHON = 3.9.1 -a $brew_version = 2.1.16 ]; then @@ -283,7 +288,7 @@ jobs: - /Users/distiller/Library/Caches/Homebrew - /usr/local/Homebrew - - run: &install-cmake + - run: &install-cmake-pyenv name: install cmake command: | brew --version @@ -377,17 +382,17 @@ jobs: - restore_cache: keys: - - v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + - v6-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 - run: *brew-update - save_cache: - key: v5-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 + key: v6-brew_cache-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1 paths: - /Users/distiller/Library/Caches/Homebrew - /usr/local/Homebrew - - run: *install-cmake + - run: *install-cmake-pyenv - restore_cache: keys: @@ -450,6 +455,13 @@ jobs: PYTHON: 3.8.0 HOMEBREW_NO_AUTO_UPDATE: 1 MACOSX_DEPLOYMENT_TARGET: 10.9 + + deploy-osx-39: + <<: *deploy-osx-template + environment: + PYTHON: 3.9.1 + HOMEBREW_NO_AUTO_UPDATE: 0 + MACOSX_DEPLOYMENT_TARGET: 10.9 ################################################################################################## @@ -572,7 +584,7 @@ workflows: #- test-osx-36 #- test-osx-37 #- test-osx-38 - - test-osx-39 + #- test-osx-39 #- test-win-35 #- test-win-36 @@ -591,6 +603,11 @@ workflows: #- test-linux32-37 #- test-linux32-38 #- test-linux32-39 + + #- deploy-linux + #- deploy-linux32 + + - deploy-osx-36 deploy: jobs: From 40b08867d2c6c94fc0e83d0207935a304d4bd42e Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 11:40:48 +0900 Subject: [PATCH 26/37] test deploy linux and osx --- .circleci/config.yml | 7 +++++-- pyqubo/package_info.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42deccdc..0e8a0994 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -604,10 +604,13 @@ workflows: #- test-linux32-38 #- test-linux32-39 - #- deploy-linux - #- deploy-linux32 + - deploy-linux + - deploy-linux32 - deploy-osx-36 + - deploy-osx-37 + - deploy-osx-38 + - deploy-osx-39 deploy: jobs: diff --git a/pyqubo/package_info.py b/pyqubo/package_info.py index 39a949da..379ea0c6 100644 --- a/pyqubo/package_info.py +++ b/pyqubo/package_info.py @@ -1,6 +1,6 @@ # (major, minor, patch, prerelease) -VERSION = (1, 0, 8, "") +VERSION = (1, 0, 8, "t1") __shortversion__ = '.'.join(map(str, VERSION[:3])) __version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:]) From ce2074b85a2126df7835cb2080b33723b2d5ce9a Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 11:49:24 +0900 Subject: [PATCH 27/37] use pip wheel --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e8a0994..b5c76c25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -199,8 +199,8 @@ jobs: echo $PYBIN if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 10))"; then continue; fi; "${PYBIN}/pip" install -r requirements.txt - #"${PYBIN}/pip" wheel . -w ./wheelhouse - "${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse + "${PYBIN}/pip" wheel . -w ./wheelhouse + #"${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse "${PYBIN}/python" setup.py sdist -d ./dist done From 2f34687aff0c68a5e32b1a89812daeb60b1069b1 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 11:52:57 +0900 Subject: [PATCH 28/37] revert version --- pyqubo/package_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqubo/package_info.py b/pyqubo/package_info.py index 379ea0c6..39a949da 100644 --- a/pyqubo/package_info.py +++ b/pyqubo/package_info.py @@ -1,6 +1,6 @@ # (major, minor, patch, prerelease) -VERSION = (1, 0, 8, "t1") +VERSION = (1, 0, 8, "") __shortversion__ = '.'.join(map(str, VERSION[:3])) __version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:]) From d25e2b88a162f199713610bbc1e6dfac47ef01b9 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 12:19:38 +0900 Subject: [PATCH 29/37] create alias for cmake --- .circleci/config.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5c76c25..7b03b9c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -199,8 +199,9 @@ jobs: echo $PYBIN if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 10))"; then continue; fi; "${PYBIN}/pip" install -r requirements.txt - "${PYBIN}/pip" wheel . -w ./wheelhouse - #"${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse + #"${PYBIN}/pip" wheel . -w ./wheelhouse + alias cmake="${PYBIN}/cmake" + "${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse "${PYBIN}/python" setup.py sdist -d ./dist done @@ -607,10 +608,10 @@ workflows: - deploy-linux - deploy-linux32 - - deploy-osx-36 - - deploy-osx-37 - - deploy-osx-38 - - deploy-osx-39 + #- deploy-osx-36 + #- deploy-osx-37 + #- deploy-osx-38 + #- deploy-osx-39 deploy: jobs: From a9a644f26e485eea7ae342f5315d1363c0914850 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 12:36:29 +0900 Subject: [PATCH 30/37] pass PATH --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b03b9c1..a022582b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -200,8 +200,7 @@ jobs: if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 10))"; then continue; fi; "${PYBIN}/pip" install -r requirements.txt #"${PYBIN}/pip" wheel . -w ./wheelhouse - alias cmake="${PYBIN}/cmake" - "${PYBIN}/python" setup.py bdist_wheel -d ./wheelhouse + PATH=$PYBIN:$PATH python setup.py bdist_wheel -d ./wheelhouse "${PYBIN}/python" setup.py sdist -d ./dist done From 272b8bf6c21cafac1798318dc7d090bd2a0194bc Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 14:25:01 +0900 Subject: [PATCH 31/37] test python39 on win --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a022582b..eca0c6c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -590,7 +590,7 @@ workflows: #- test-win-36 #- test-win-37 #- test-win-38 - #- test-win-39 + - test-win-39 #- test-linux-35 #- test-linux-36 @@ -604,8 +604,8 @@ workflows: #- test-linux32-38 #- test-linux32-39 - - deploy-linux - - deploy-linux32 + #- deploy-linux + #- deploy-linux32 #- deploy-osx-36 #- deploy-osx-37 From cc74f3821b70d7ac61e58305a3406e2bd7621646 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 14:35:29 +0900 Subject: [PATCH 32/37] test deploy win --- .circleci/config.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eca0c6c5..c763c043 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,7 +81,7 @@ jobs: - restore_cache: keys: - - v2-dependencies-{{ checksum "requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} + - v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements_doctest.txt" }}-{{ .Environment.CIRCLE_JOB }} - run: name: install dependencies @@ -94,7 +94,7 @@ jobs: - save_cache: paths: - ./env - key: v2-dependencies-{{ checksum "requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} + key: - v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements_doctest.txt" }}-{{ .Environment.CIRCLE_JOB }} - run: *install-package-template @@ -485,6 +485,7 @@ jobs: command: | choco install -y cmake + # Python 3.7 is already installed if [ $PYTHON != '3.7.3' ]; then choco install -y python --version "${PYTHON}" fi @@ -567,6 +568,12 @@ jobs: environment: PYTHON: 3.8.5 PYTHON_PATH: C:/Python38/ + + deploy-win-39: + <<: *deploy-win-template + environment: + PYTHON: 3.9.1 + PYTHON_PATH: C:/Python39/ deploy-win-35: <<: *deploy-win-template @@ -586,11 +593,12 @@ workflows: #- test-osx-38 #- test-osx-39 - #- test-win-35 - #- test-win-36 - #- test-win-37 - #- test-win-38 - - test-win-39 + - test-win-35 + - test-win-36 + - test-win-37 + - test-win-38 + #- test-win-39 + - deploy-win-39 #- test-linux-35 #- test-linux-36 From 6b2e8c60f6f9e941237951d9eaec45b82e7a3ba9 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 14:36:47 +0900 Subject: [PATCH 33/37] fix restore path --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c763c043..2f03beca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,7 +94,7 @@ jobs: - save_cache: paths: - ./env - key: - v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements_doctest.txt" }}-{{ .Environment.CIRCLE_JOB }} + key: v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements_doctest.txt" }}-{{ .Environment.CIRCLE_JOB }} - run: *install-package-template @@ -585,7 +585,7 @@ jobs: workflows: tests: jobs: - #- test-linux-doctest + - test-linux-doctest #- test-osx-35 #- test-osx-36 From 341e47e15f4431be5cd39e840ad90a05f7f16313 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 14:48:04 +0900 Subject: [PATCH 34/37] test all tests and deploy win --- .circleci/config.yml | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f03beca..9d807197 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -587,30 +587,33 @@ workflows: jobs: - test-linux-doctest - #- test-osx-35 - #- test-osx-36 - #- test-osx-37 - #- test-osx-38 - #- test-osx-39 + - test-osx-35 + - test-osx-36 + - test-osx-37 + - test-osx-38 + - test-osx-39 - test-win-35 - test-win-36 - test-win-37 - test-win-38 - #- test-win-39 - - deploy-win-39 - - #- test-linux-35 - #- test-linux-36 - #- test-linux-37 - #- test-linux-38 - #- test-linux-39 - - #- test-linux32-35 - #- test-linux32-36 - #- test-linux32-37 - #- test-linux32-38 - #- test-linux32-39 + - test-win-39 + - deploy-win-35 + - deploy-win-36 + - deploy-win-37 + - deploy-win-38 + + - test-linux-35 + - test-linux-36 + - test-linux-37 + - test-linux-38 + - test-linux-39 + + - test-linux32-35 + - test-linux32-36 + - test-linux32-37 + - test-linux32-38 + - test-linux32-39 #- deploy-linux #- deploy-linux32 From a45fe8cfacf07cc366e6e142548476b7869e1e14 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 14:56:05 +0900 Subject: [PATCH 35/37] test all deploys --- .circleci/config.yml | 63 ++++++++++++++++++++++-------------------- pyqubo/package_info.py | 2 +- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d807197..003e67dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -587,41 +587,44 @@ workflows: jobs: - test-linux-doctest - - test-osx-35 - - test-osx-36 - - test-osx-37 - - test-osx-38 - - test-osx-39 + #- test-osx-35 + #- test-osx-36 + #- test-osx-37 + #- test-osx-38 + #- test-osx-39 - - test-win-35 - - test-win-36 - - test-win-37 - - test-win-38 - - test-win-39 + #- test-win-35 + #- test-win-36 + #- test-win-37 + #- test-win-38 + #- test-win-39 + + #- test-linux-35 + #- test-linux-36 + #- test-linux-37 + #- test-linux-38 + #- test-linux-39 + + #- test-linux32-35 + #- test-linux32-36 + #- test-linux32-37 + #- test-linux32-38 + #- test-linux32-39 + + - deploy-linux + - deploy-linux32 + + - deploy-osx-35 + - deploy-osx-36 + - deploy-osx-37 + - deploy-osx-38 + - deploy-osx-39 + - deploy-win-35 - deploy-win-36 - deploy-win-37 - deploy-win-38 - - - test-linux-35 - - test-linux-36 - - test-linux-37 - - test-linux-38 - - test-linux-39 - - - test-linux32-35 - - test-linux32-36 - - test-linux32-37 - - test-linux32-38 - - test-linux32-39 - - #- deploy-linux - #- deploy-linux32 - - #- deploy-osx-36 - #- deploy-osx-37 - #- deploy-osx-38 - #- deploy-osx-39 + - deploy-win-39 deploy: jobs: diff --git a/pyqubo/package_info.py b/pyqubo/package_info.py index 39a949da..44f0228b 100644 --- a/pyqubo/package_info.py +++ b/pyqubo/package_info.py @@ -1,6 +1,6 @@ # (major, minor, patch, prerelease) -VERSION = (1, 0, 8, "") +VERSION = (1, 0, 800, "") __shortversion__ = '.'.join(map(str, VERSION[:3])) __version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:]) From 781efd52c78deb98ce8d63fd56d24f163711a09e Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 15:13:11 +0900 Subject: [PATCH 36/37] set to original --- .circleci/config.yml | 65 +++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 003e67dd..bbe60e75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -222,11 +222,11 @@ jobs: echo -e "username = $PYPI_USERNAME" >> ~/.pypirc # for testpypi - echo -e "repository = https://test.pypi.org/legacy/" >> ~/.pypirc - echo -e "password = $TEST_PYPI_PASSWORD" >> ~/.pypirc + #echo -e "repository = https://test.pypi.org/legacy/" >> ~/.pypirc + #echo -e "password = $TEST_PYPI_PASSWORD" >> ~/.pypirc # for actual pypi - #echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc + echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc - run: name: python setup @@ -587,44 +587,29 @@ workflows: jobs: - test-linux-doctest - #- test-osx-35 - #- test-osx-36 - #- test-osx-37 - #- test-osx-38 - #- test-osx-39 + - test-osx-35 + - test-osx-36 + - test-osx-37 + - test-osx-38 + - test-osx-39 - #- test-win-35 - #- test-win-36 - #- test-win-37 - #- test-win-38 - #- test-win-39 - - #- test-linux-35 - #- test-linux-36 - #- test-linux-37 - #- test-linux-38 - #- test-linux-39 - - #- test-linux32-35 - #- test-linux32-36 - #- test-linux32-37 - #- test-linux32-38 - #- test-linux32-39 - - - deploy-linux - - deploy-linux32 - - - deploy-osx-35 - - deploy-osx-36 - - deploy-osx-37 - - deploy-osx-38 - - deploy-osx-39 - - - deploy-win-35 - - deploy-win-36 - - deploy-win-37 - - deploy-win-38 - - deploy-win-39 + - test-win-35 + - test-win-36 + - test-win-37 + - test-win-38 + - test-win-39 + + - test-linux-35 + - test-linux-36 + - test-linux-37 + - test-linux-38 + - test-linux-39 + + - test-linux32-35 + - test-linux32-36 + - test-linux32-37 + - test-linux32-38 + - test-linux32-39 deploy: jobs: From afbf275052d5ca032bcb977b9d60f3e5ee064d85 Mon Sep 17 00:00:00 2001 From: kotarotanahashi Date: Thu, 21 Jan 2021 15:14:23 +0900 Subject: [PATCH 37/37] update to 1.0.9 --- pyqubo/package_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqubo/package_info.py b/pyqubo/package_info.py index 44f0228b..28be92e6 100644 --- a/pyqubo/package_info.py +++ b/pyqubo/package_info.py @@ -1,6 +1,6 @@ # (major, minor, patch, prerelease) -VERSION = (1, 0, 800, "") +VERSION = (1, 0, 9, "") __shortversion__ = '.'.join(map(str, VERSION[:3])) __version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:])