From 4b690283908f69de35a3ab66c0fb190b35be0783 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Sun, 24 Sep 2017 23:12:16 -0600 Subject: [PATCH 1/6] test removal of python version in Pipfile --- Pipfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 710904c0..5df74b0b 100644 --- a/Pipfile +++ b/Pipfile @@ -10,5 +10,4 @@ twine = "*" "pytest-xdist" = {version = "*", os_name = "=='posix'"} -[requires] -python_version = "3.6" + From 42d85513d4134e1b0ee9f820e238851f6f117ec1 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Sun, 24 Sep 2017 23:23:30 -0600 Subject: [PATCH 2/6] enabled pypy tests on travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f21f98d9..1298327f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,10 @@ python: - "3.4" - "3.5" - "3.6" + - "pypy" + - "pypy3" + # TODO: pkg_config issues # - "3.7-dev" - # - "pypy" - # - "pypy3" # TODO: pkg_config issues # command to install dependencies install: From 74644c4215345f430888bbf1b0804416e0a8a08c Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Sun, 24 Sep 2017 23:24:14 -0600 Subject: [PATCH 3/6] added xdist to app veyor...let's see how this goes --- Pipfile | 5 +---- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Pipfile b/Pipfile index 5df74b0b..3ebde53c 100644 --- a/Pipfile +++ b/Pipfile @@ -7,7 +7,4 @@ sphinx = "<=1.5.5" "-e ." = "*" twine = "*" "sphinx-click" = "*" -"pytest-xdist" = {version = "*", os_name = "=='posix'"} - - - +"pytest-xdist" = * \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 364857c8..cf243cd9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,4 +52,4 @@ install: - "pipenv install --system --dev --skip-lock" test_script: - - "pytest tests/test_pipenv.py tests/test_project.py tests/test_utils.py" + - "pipenv run pytest -n 8 tests/test_pipenv.py tests/test_project.py tests/test_utils.py" From 7b352e8359b39fb27d7f18221d9170598733b632 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Sun, 24 Sep 2017 23:25:51 -0600 Subject: [PATCH 4/6] quotes --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 3ebde53c..a7b234e7 100644 --- a/Pipfile +++ b/Pipfile @@ -7,4 +7,4 @@ sphinx = "<=1.5.5" "-e ." = "*" twine = "*" "sphinx-click" = "*" -"pytest-xdist" = * \ No newline at end of file +"pytest-xdist" = "*" \ No newline at end of file From d96afec47c1b314c3c49117b88c99ec9c427e1ef Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Sun, 24 Sep 2017 23:55:32 -0600 Subject: [PATCH 5/6] pypy3 hangs on travis, lets try 3.7 dev? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1298327f..d8b1782f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ python: - "3.5" - "3.6" - "pypy" - - "pypy3" - # TODO: pkg_config issues + - "3.7-dev" + # - "pypy3" # TODO: pkg_config issues # - "3.7-dev" # command to install dependencies From 5ab74ae1950be1f656ee290eaa550fd63bcd3c45 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Mon, 25 Sep 2017 00:07:05 -0600 Subject: [PATCH 6/6] add tests for 32 bit windows installations which I believe is the default installer from python.org --- appveyor.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index cf243cd9..3dfbcfd3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,21 +15,41 @@ environment: PYTHON_ARCH: "64" TOXENV: "py27" + - PYTHON: "C:\\Python27" + PYTHON_VERSION: "2.7.x" + PYTHON_ARCH: "32" + TOXENV: "py27" + - PYTHON: "C:\\Python34-x64" PYTHON_VERSION: "3.4.x" PYTHON_ARCH: "64" TOXENV: "py34" + - PYTHON: "C:\\Python34" + PYTHON_VERSION: "3.4.x" + PYTHON_ARCH: "32" + TOXENV: "py34" + - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.x" PYTHON_ARCH: "64" TOXENV: "py35" + - PYTHON: "C:\\Python35" + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "32" + TOXENV: "py35" + - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "64" TOXENV: "py36" + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "32" + TOXENV: "py36" + install: # Install Python (from the official .msi of http://python.org) and pip when # not already installed.