From 26a72eaf4ecdaf5b20bc2cd782cf585f77bd6d96 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 2 Jan 2020 14:45:13 +0100 Subject: [PATCH] Bump Python SDK and Pytest to the latest version (#31) --- Pipfile | 4 ++-- Pipfile.lock | 43 ++++++++++++++++++++++--------------------- azure-pipelines.yml | 2 +- requirements.txt | 4 ++-- setup.cfg | 1 + setup.py | 2 +- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Pipfile b/Pipfile index f13f834..c4236b7 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,7 @@ pip = "*" pre-commit = "*" pycodestyle = "*" pylint = "*" -pytest= "<5.1" +pytest= "*" pytest-cov="*" python-dotenv = "*" setuptools = "*" @@ -21,7 +21,7 @@ sphinx = "*" [packages] -isogeo-pysdk = ">=3.2.5,<3.3" +isogeo-pysdk = ">=3.2.5,<3.4" openpyxl = "==3.0.*" [requires] diff --git a/Pipfile.lock b/Pipfile.lock index cadc673..adf83fe 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "33cd5ea38753421fec0e026cc84c865a276f6562169e7468e5ce2e1d9aa3a7b6" + "sha256": "bb0bf4445eb0e66de22b6e10eb1eae7df5e8c7d0a911b90292c12fb25045b541" }, "pipfile-spec": 6, "requires": { @@ -45,11 +45,11 @@ }, "isogeo-pysdk": { "hashes": [ - "sha256:5324f1b76d7f53eb2ac7870de8845fcb69f8ffe6e409f06d34b1697d214d559a", - "sha256:c90d24703dad37d1b40371efacabe803206d555f5a262b10820b7f69b0fea9ce" + "sha256:2fbf1d75d9f4a0cf80b4d74239a143c9b34a63585fe286f8daf5b41a8aeb249f", + "sha256:d17574215aeaab71b417296b002701b3d51b0700f28d7a689ca944b8b0f72b6c" ], "index": "pypi", - "version": "==3.2.6" + "version": "==3.3.0" }, "jdcal": { "hashes": [ @@ -128,6 +128,7 @@ "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" ], + "markers": "sys_platform == 'win32'", "version": "==1.3.0" }, "attrs": { @@ -139,10 +140,10 @@ }, "babel": { "hashes": [ - "sha256:af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", - "sha256:e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28" + "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38", + "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4" ], - "version": "==2.7.0" + "version": "==2.8.0" }, "black": { "hashes": [ @@ -400,9 +401,10 @@ }, "pathspec": { "hashes": [ - "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c" + "sha256:163b0632d4e31cef212976cf57b43d9fd6b0bac6e67c26015d611a647d5e7424", + "sha256:562aa70af2e0d434367d9790ad37aed893de47f1693e4201fd1d3dca15d19b96" ], - "version": "==0.6.0" + "version": "==0.7.0" }, "pkginfo": { "hashes": [ @@ -428,10 +430,10 @@ }, "py": { "hashes": [ - "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", - "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53" + "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa", + "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0" ], - "version": "==1.8.0" + "version": "==1.8.1" }, "pycodestyle": { "hashes": [ @@ -472,11 +474,11 @@ }, "pytest": { "hashes": [ - "sha256:6ef6d06de77ce2961156013e9dff62f1b2688aa04d0dc244299fe7d67e09370d", - "sha256:a736fed91c12681a7b34617c8fcefe39ea04599ca72c608751c31d89579a3f77" + "sha256:6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa", + "sha256:e41d489ff43948babd0fad7ad5e49b8735d5d55e26628a58673c39ff61d95de4" ], "index": "pypi", - "version": "==5.0.1" + "version": "==5.3.2" }, "pytest-cov": { "hashes": [ @@ -645,10 +647,10 @@ }, "tqdm": { "hashes": [ - "sha256:166a82cdea964ae45528e0cc89436255ff2be73dc848bdf239f13c501cae5dc7", - "sha256:9036904496bd2afacf836a6f206c5a766ce11d3e9319d54a4e794c0f34b111dc" + "sha256:4789ccbb6fc122b5a6a85d512e4e41fc5acad77216533a6f2b8ce51e0f265c23", + "sha256:efab950cf7cc1e4d8ee50b2bb9c8e4a89f8307b49e0b2c9cfef3ec4ca26655eb" ], - "version": "==4.41.0" + "version": "==4.41.1" }, "twine": { "hashes": [ @@ -700,10 +702,9 @@ }, "wcwidth": { "hashes": [ - "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", - "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c" + "sha256:8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603" ], - "version": "==0.1.7" + "version": "==0.1.8" }, "webencodings": { "hashes": [ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d8e4fd2..58d854c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ stages: - script: | python -m black --target-version=py37 ./$(packageFolderName) - python -m black --target-version=py37 .\tests + python -m black --target-version=py37 ./tests displayName: 'Apply black code formatting' - script: | diff --git a/requirements.txt b/requirements.txt index 2a70ad5..7d7889c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ setuptools wheel # required -isogeo-pysdk>=3.2.5,<3.3 +isogeo-pysdk>=3.2.5,<3.4 openpyxl==3.0.* # development @@ -24,7 +24,7 @@ black flake8 pre-commit pylint -pytest==5.0.* +pytest pytest-cov python-dotenv sphinx diff --git a/setup.cfg b/setup.cfg index 3a83a82..0f57789 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,6 +10,7 @@ description-file = README.md [tool:pytest] addopts = --junitxml=junit/test-results.xml --cov-config=.coveragerc --cov=isogeotoxlsx --cov-report=xml --cov-report=html --cov-append tests/ --ignore=tests/_wip/ +junit_family = xunit2 minversion = 3.2 norecursedirs = .* build dev development dist docs CVS fixtures _darcs {arch} *.egg venv _wip testpaths = tests diff --git a/setup.py b/setup.py index 3a88459..33fa32f 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ "Source": "https://github.com/isogeo/export-xlsx-py/", }, # dependencies - install_requires=["isogeo-pysdk>=3.2.5,<3.3", "openpyxl==3.0.*"], + install_requires=["isogeo-pysdk>=3.2.5,<3.4", "openpyxl==3.0.*"], extras_require={ "dev": ["black", "python-dotenv"], "test": ["codecov", "coverage", "pytest", "pytest-cov"],