From 1a3c5d22e424a358c7f5a88befa0f773cbd79a25 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:16:23 +0530 Subject: [PATCH 01/12] fix setup.py --- CHANGELOG.md | 11 ++++++++++- setup.py | 2 +- version.txt | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd787d2..3055007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.13.2] + +### Changed + +* Fix `typing-extension` in `setup.py` [#132] + +[#131]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/132 + ## [0.13.1] ### Changed @@ -284,7 +292,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * First public release -[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.1...HEAD +[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.2...HEAD +[0.13.2]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.1...rel/0.13.2 [0.13.1]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.0...rel/0.13.1 [0.13.0]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.12.0...rel/0.13.0 [0.12.0]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.11.0...rel/0.12.0 diff --git a/setup.py b/setup.py index 7645d7e..399d3ec 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def get_long_version(): author="Michael Haas", author_email="michael.haas01@sap.com", url="https://github.com/sap/data-attribute-recommendation-python-sdk", - install_requires=["requests~=2.20", "typing-extensions~=3.7", "cfenv~=0.5"], + install_requires=["requests~=2.20", "typing-extensions~=4.0", "cfenv~=0.5"], packages=find_packages(exclude=["tests"]), include_package_data=True, python_requires="~=3.5", diff --git a/version.txt b/version.txt index c317a91..9beb74d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.13.1 +0.13.2 From 646bb49c97e0bfbf7791f6b808ef115e63f97dbb Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:23:32 +0530 Subject: [PATCH 02/12] fix PR link --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3055007..69aaa3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -* Fix `typing-extension` in `setup.py` [#132] +* Fix `typing-extension` in `setup.py` [#133] -[#131]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/132 +[#133]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/133 ## [0.13.1] From 20448482b4674d5177016180bd8a12e4f58cbc7d Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:31:10 +0530 Subject: [PATCH 03/12] fix setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 399d3ec..830f888 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def get_long_version(): author="Michael Haas", author_email="michael.haas01@sap.com", url="https://github.com/sap/data-attribute-recommendation-python-sdk", - install_requires=["requests~=2.20", "typing-extensions~=4.0", "cfenv~=0.5"], + install_requires=["requests~=2.20", "typing-extensions~=4.0; python_version < '3.6'", "typing-extensions~=4.0", "cfenv~=0.5"], packages=find_packages(exclude=["tests"]), include_package_data=True, python_requires="~=3.5", From 6a7b268c87eb4b9cfc0528ca04e61f99610421f8 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:31:48 +0530 Subject: [PATCH 04/12] fix setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 830f888..330ccd6 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,9 @@ def get_long_version(): author="Michael Haas", author_email="michael.haas01@sap.com", url="https://github.com/sap/data-attribute-recommendation-python-sdk", - install_requires=["requests~=2.20", "typing-extensions~=4.0; python_version < '3.6'", "typing-extensions~=4.0", "cfenv~=0.5"], + install_requires=[ + "requests~=2.20", "typing-extensions~=4.0; python_version < '3.6'", "typing-extensions~=4.0", "cfenv~=0.5" + ], packages=find_packages(exclude=["tests"]), include_package_data=True, python_requires="~=3.5", From 6dd029b01c0c90b8deca9155911ef8ae0200a798 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:42:02 +0530 Subject: [PATCH 05/12] fix setup.py --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 330ccd6..0724a0d 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,10 @@ def get_long_version(): author_email="michael.haas01@sap.com", url="https://github.com/sap/data-attribute-recommendation-python-sdk", install_requires=[ - "requests~=2.20", "typing-extensions~=4.0; python_version < '3.6'", "typing-extensions~=4.0", "cfenv~=0.5" + "requests~=2.20", + "typing-extensions~=3.7; python_version < '3.6'", + "typing-extensions~=4.0", + "cfenv~=0.5", ], packages=find_packages(exclude=["tests"]), include_package_data=True, From 976cee06e2682dd1d508723c6b61bff2715881ff Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 17:57:21 +0530 Subject: [PATCH 06/12] fix requirements for python 3.5 --- requirements.txt | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d3ce917..796cc6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ cfenv==0.5.3 requests==2.25.1 +typing-extensions==3.10.0.0 ; python_version < '3.6' typing-extensions==4.0.0 diff --git a/setup.py b/setup.py index 0724a0d..42ed8d2 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def get_long_version(): url="https://github.com/sap/data-attribute-recommendation-python-sdk", install_requires=[ "requests~=2.20", - "typing-extensions~=3.7; python_version < '3.6'", + "typing-extensions~=3.7 : python_version < '3.6'", "typing-extensions~=4.0", "cfenv~=0.5", ], From fe3468db61c622fc77aebfe954fc369bec20c09f Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:05:05 +0530 Subject: [PATCH 07/12] fix install_requires --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 42ed8d2..5b06b71 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def get_long_version(): url="https://github.com/sap/data-attribute-recommendation-python-sdk", install_requires=[ "requests~=2.20", - "typing-extensions~=3.7 : python_version < '3.6'", + "typing-extensions~=3.7;python_version<'3.6'", "typing-extensions~=4.0", "cfenv~=0.5", ], From befd8f9f255802e91ed4e5d7de9ae11e0ccf82d5 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:32:59 +0530 Subject: [PATCH 08/12] remove python 3.5 support --- .travis.yml | 4 ---- CHANGELOG.md | 14 +++++++++----- CONTRIBUTING.md | 2 +- requirements.txt | 1 - setup.py | 4 +--- tox.ini | 6 +++--- version.txt | 2 +- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13a52d5..bd6acd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,10 +94,6 @@ jobs: on: tags: true condition: $TRAVIS_TAG =~ ^rel/.*$ - - stage: test - name: "Python: 3.5 on Linux" - python: "3.5" - env: TOXENV=py35-cov - stage: test name: "Python: 3.6 on Linux" python: "3.6" diff --git a/CHANGELOG.md b/CHANGELOG.md index 69aaa3a..8bedc9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.13.2] +## [0.14.0] ### Changed -* Fix `typing-extension` in `setup.py` [#133] +* Fixes `typing-extension` in `setup.py` [#133] + +### Deprecated + +* Drops support for Python 3.5 [#133]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/133 @@ -18,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -* Updated `typing-extension` to version `4.0.0` [#131] +* Updates `typing-extension` to version `4.0.0` [#131] [#131]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/131 @@ -292,8 +296,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * First public release -[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.2...HEAD -[0.13.2]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.1...rel/0.13.2 +[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.14.0...HEAD +[0.14.0]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.1...rel/0.14.0 [0.13.1]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.13.0...rel/0.13.1 [0.13.0]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.12.0...rel/0.13.0 [0.12.0]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.11.0...rel/0.12.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ec4371..9936ffc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -135,7 +135,7 @@ To run the unit tests, simply call `tox`: $ tox ``` -By default, `tox` will run tests against Python 3.5, 3.6, 3.7 and 3.8. +By default, `tox` will run tests against Python 3.6, 3.7 and 3.8. If you do not have all of these versions installed, you can select only those versions that you have installed: diff --git a/requirements.txt b/requirements.txt index 796cc6f..d3ce917 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ cfenv==0.5.3 requests==2.25.1 -typing-extensions==3.10.0.0 ; python_version < '3.6' typing-extensions==4.0.0 diff --git a/setup.py b/setup.py index 5b06b71..a56676b 100644 --- a/setup.py +++ b/setup.py @@ -29,20 +29,18 @@ def get_long_version(): url="https://github.com/sap/data-attribute-recommendation-python-sdk", install_requires=[ "requests~=2.20", - "typing-extensions~=3.7;python_version<'3.6'", "typing-extensions~=4.0", "cfenv~=0.5", ], packages=find_packages(exclude=["tests"]), include_package_data=True, - python_requires="~=3.5", + python_requires="~=3.6", classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Intended Audience :: Information Technology", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/tox.ini b/tox.ini index 05c5039..76af882 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] # exclude "system_tests" by default: these need service credentials -envlist = py35, py36, py37, py38, py39 +envlist = py36, py37, py38, py39 [testenv] whitelist_externals = mkdir @@ -10,8 +10,8 @@ setenv = COVERAGE_FILE = test_results/{envname}/unit_coverage/.coverage passenv = DAR_* TRAVIS TRAVIS_* COVERALLS_* deps = - zipp<2.0.0 # for python 3.5 support - pytest==6.1.2 # latest supporting Python 3.5 + zipp<3.7.0 # for python 3.6 support + pytest==7.0.1 for python 3.6 support pytest-cov==2.12.1 httpretty==1.1.4 cov: coveralls==3.1.0 diff --git a/version.txt b/version.txt index 9beb74d..a803cc2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.13.2 +0.14.0 From 75e0d6b37d428dda405741a6cc476a0a0c2380a1 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:39:28 +0530 Subject: [PATCH 09/12] fix tox config --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 76af882..db1e832 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ passenv = DAR_* TRAVIS TRAVIS_* COVERALLS_* deps = zipp<3.7.0 # for python 3.6 support - pytest==7.0.1 for python 3.6 support + pytest==7.0.1 # for python 3.6 support pytest-cov==2.12.1 httpretty==1.1.4 cov: coveralls==3.1.0 From d5d70639a81046b1cd468e2d437f546e5dc940c9 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:48:51 +0530 Subject: [PATCH 10/12] update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9936ffc..7caec75 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -135,7 +135,7 @@ To run the unit tests, simply call `tox`: $ tox ``` -By default, `tox` will run tests against Python 3.6, 3.7 and 3.8. +By default, `tox` will run tests against Python 3.6, 3.7, 3.8, and 3.9 If you do not have all of these versions installed, you can select only those versions that you have installed: From c834e5f90cfdad1c83e07bd014f051cb17794aa8 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:53:45 +0530 Subject: [PATCH 11/12] update docs --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index c7d4915..d21ff3e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -9,7 +9,7 @@ Features - Easy to use - High-level flows on top of the basic Data Attribute Recommendation APIs - Fully type annotated for great autocomplete experience -- Supports Python 3.6 up to 3.9 (3.5 will be removed in an upcoming release) +- Supports Python 3.6 up to 3.9 (3.5 support removed in version 0.14.0) Release Notes ------------- From 04295ce4e282c13b08611eb3b55684327add7887 Mon Sep 17 00:00:00 2001 From: Sreevishnu Date: Mon, 9 Jan 2023 18:55:38 +0530 Subject: [PATCH 12/12] fix formatting --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index d21ff3e..24f7c08 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -9,7 +9,7 @@ Features - Easy to use - High-level flows on top of the basic Data Attribute Recommendation APIs - Fully type annotated for great autocomplete experience -- Supports Python 3.6 up to 3.9 (3.5 support removed in version 0.14.0) +- Supports Python 3.6 up to 3.9 (3.5 support removed in version `0.14.0`) Release Notes -------------