core - update dependencies and ci matrix responsibilities (cloud-cust…

…odian#3902)
Refinitiv · May 1, 2019 · e2bdc62 · e2bdc62
1 parent 334abb7
commit e2bdc62
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 40 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -31,10 +31,10 @@ jobs:
     matrix:
       Python27:
         python.version: '2.7'
-        TOXENV: py27-cov
+        TOXENV: py27
       Python36:
         python.version: '3.6'
-        TOXENV: py36
+        TOXENV: py36-cov
       Python37:
         python.version: '3.7'
         TOXENV: py37
@@ -61,7 +61,7 @@ jobs:
 
   - script: python tools/dev/cicov.py
     displayName: 'Publish Code Coverage'
-    condition: "eq(variables['python.version'], '2.7')"
+    condition: "eq(variables['python.version'], '3.6')"
     env:
       CODECOV_TOKEN: $(CODECOV_TOKEN)
       PR: $(system.pullRequest.pullRequestNumber)
@@ -72,7 +72,7 @@ jobs:
       BUILD_REASON: $(Build.Reason)
       BUILD_BRANCH: $(Build.SourceBranchName)
 
-  - script: make sphinx
+  - script: TOXENV=docs tox
     displayName: "Docs Build"
     condition: "eq(variables['python.version'], '3.7')"
 

diff --git a/docs/Makefile.sphinx b/docs/Makefile.sphinx
@@ -2,7 +2,7 @@
 #
 
 ifndef VIRTUALENV
-VIRTUALENV = py37
+VIRTUALENV = docs
 endif
 
 # You can set these variables from the command line.

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -5,31 +5,26 @@ coverage==4.5.3
 mock==2.0.0
 placebo==0.9.0
 flake8==3.7.7
-pytest==4.3.0
-pytest-xdist==1.26.1
+pytest==4.4.1
+pytest-xdist==1.28.0
 pytest-cov==2.6.1
 parameterized==0.7.0
 twine==1.13.0
-tox==3.7.0
-nose==1.3.7
-nose-timer==0.7.4
+tox==3.9.0
 six >= 1.12.0
 
 # Optional feature testing in c7n
-psutil==5.6.1
+psutil==5.6.2
 aws_xray_sdk==2.4.2
 
--r tools/c7n_sphinxext/requirements.txt
 -r tools/c7n_mailer/requirements.txt
 -r tools/c7n_azure/requirements.txt
 -r tools/c7n_gcp/requirements.txt
+-r tools/c7n_kube/requirements.txt
 
 # Specific to testing mailer
-fakeredis==1.0.2
+fakeredis==1.0.3
 
-# Tools packages in editable setup
-# Local package required for Sphinx docs
--e tools/c7n_sphinxext
 # Local package required for c7n_mailer tests
 -e tools/c7n_mailer
 # Local package required for c7n_azure tests

diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -0,0 +1,8 @@
+# Split out from requirements-dev.txt as sphinx
+# has dropped support for python2.7
+
+-r tools/c7n_sphinxext/requirements.txt
+
+# Tools packages in editable setup
+# Local package required for Sphinx docs
+-e tools/c7n_sphinxext
diff --git a/requirements.txt b/requirements.txt
@@ -3,9 +3,7 @@ boto3>=1.9.94
 botocore>=1.12.94
 jsonschema>=2.5.1
 PyYAML>=4.2b4
-# Pinned due to azure-core-cli pin on tabulate
-# https://github.com/Azure/azure-cli/issues/8567
-tabulate==0.8.2
+tabulate>=0.8.2
 jsonpatch>=1.2.1
 futures>=3.1.1
 python-dateutil>=2.6
diff --git a/setup.py b/setup.py
@@ -30,8 +30,6 @@ def read(fname):
         "jsonschema",
         "jsonpatch>=1.21",
         "argcomplete",
-# Pinned due to azure-core-cli pin on tabulate
-# https://github.com/Azure/azure-cli/issues/8567
-        "tabulate==0.8.2"
+        "tabulate>=0.8.2"
     ],
 )
diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
@@ -50,8 +50,8 @@ class DocExampleTest(BaseTest):
          # to run on the py3.6 test runner, as its the only one
          # without additional responsibilities.
          (os.environ.get('C7N_TEST_RUN') and
-          sys.version_info.major == 3 and
-          sys.version_info.minor == 6)))
+          sys.version_info.major == 2 and
+          sys.version_info.minor == 7)))
 
     @skipif(skip_condition, reason="Doc tests must be explicitly enabled with C7N_DOC_TEST")
     def test_doc_examples(self):

diff --git a/tools/c7n_mailer/requirements.txt b/tools/c7n_mailer/requirements.txt
@@ -7,10 +7,7 @@ Jinja2==2.10.1
 jsonschema>=2.5.1
 ruamel.yaml>=0.15.93
 six>=1.12.0
-datadog==0.27.0
+datadog==0.28.0
 sendgrid==5.6.0
-# pinned to 3.1.0 due to an issue with 3.2 and fakeredis, as
-# 3.2 performs socket verification.
-# https://github.com/jamesls/fakeredis/issues/235
-redis==3.1.0
-ldap3==2.5.2
+redis==3.2.1
+ldap3==2.6
diff --git a/tools/c7n_sphinxext/requirements.txt b/tools/c7n_sphinxext/requirements.txt
@@ -1,7 +1,7 @@
-Sphinx==1.8.5
+Sphinx==2.0.1
 # Needs a pin as 2.3.1 has a bug with yaml addressed in:
 # https://bitbucket.org/birkenfeld/pygments-main/pull-requests/797
 # issue requesting a new release with fix:
 # https://bitbucket.org/birkenfeld/pygments-main/issues/1499
-Pygments==2.3.0
+Pygments==2.3.0  # rq.filter: !=2.3.1
 sphinx-rtd-theme==0.4.3
diff --git a/tox.ini b/tox.ini
@@ -16,10 +16,6 @@ envlist = py27,py36,py37,lint
 [testenv]
 deps =
     -rrequirements-dev.txt
-    -rtools/c7n_mailer/requirements.txt
-    -rtools/c7n_azure/requirements.txt
-    -rtools/c7n_gcp/requirements.txt
-    -rtools/c7n_kube/requirements.txt
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1
@@ -37,14 +33,14 @@ setenv =
 commands =
     py.test -n {env:C7N_TEST_WORKERS:auto} tests tools {posargs}
 
-[testenv:py27-cov]
-commands =
-    py.test -n {env:C7N_TEST_WORKERS:auto} --cov c7n --cov tools/c7n_azure/c7n_azure --cov tools/c7n_gcp/c7n_gcp --cov tools/c7n_kube/c7n_kube --cov tools/c7n_mailer/c7n_mailer tests tools {posargs}
-
 [testenv:py36]
 commands =
     py.test -n {env:C7N_TEST_WORKERS:auto} tests tools {posargs}
 
+[testenv:py36-cov]
+commands =
+    py.test -n {env:C7N_TEST_WORKERS:auto} --cov c7n --cov tools/c7n_azure/c7n_azure --cov tools/c7n_gcp/c7n_gcp --cov tools/c7n_kube/c7n_kube --cov tools/c7n_mailer/c7n_mailer tests tools {posargs}
+
 [testenv:py37]
 commands =
     py.test -n {env:C7N_TEST_WORKERS:auto} tests tools {posargs}
@@ -59,6 +55,9 @@ commands = make lint
 [testenv:docs]
 whitelist_externals = make
 commands = make sphinx
+deps =
+  -rrequirements-dev.txt
+  -rrequirements-docs.txt
 
 [pytest]
 ; for travis, we set this up as env var that we can override to limit concurrency