Pin urllib3

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 default_language_version:
-    python: python3.7
+    python: python3.8
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
     - id: black
-      language_version: python3.7
-      args: ['--target-version', 'py35']
+      language_version: python3.8
+      args: ['--target-version', 'py38']
 -   repo: https://github.com/pycqa/flake8
     rev: 3.9.2
     hooks:
@@ -32,8 +32,8 @@ repos:
       exclude: docs/
       additional_dependencies:
         - "types-requests~=0.1.9" # type stubs for requests. mypy 0.900 no longer ships these.
--   repo: https://github.com/pre-commit/mirrors-pylint
-    rev: 'v2.7.4'
+-   repo: https://github.com/pylint-dev/pylint
+    rev: 'v2.17.4'
     hooks:
     -   id: pylint
         args: [

.travis.yml

@@ -44,7 +44,7 @@ stages:
 language: python
 install:
   # Fix build on 3.7: https://github.com/pypa/setuptools/issues/3293
-- pip3 install 'setuptools==60.9.0;python_version=="3.7"'
+- pip3 install 'setuptools==60.9.0;python_version=="3.8"'
 - pip3 install -r requirements-test.txt
 script: tox
 
@@ -66,11 +66,11 @@ env:
 jobs:
   include:
   - stage: linting
-    python: '3.7' # only run once.
+    python: '3.8' # only run once.
     install:
     - pip install -r requirements-dev.txt
     script:
-    - pyenv global 3.7.1
+    - pyenv global 3.8.2
     - pre-commit run --all-files
   - stage: system tests
     os: windows
@@ -94,14 +94,6 @@ jobs:
         on:
           tags: true
           condition:  $TRAVIS_TAG =~ ^rel/.*$
-  - stage: test
-    name: "Python: 3.6 on Linux"
-    python: "3.6"
-    env: TOXENV=py36-cov
-  - stage: test
-    name: "Python: 3.7 on Linux"
-    python: "3.7"
-    env: TOXENV=py37-cov
   - stage: test
     name: "Python: 3.8 on Linux"
     python: "3.8"
@@ -110,6 +102,14 @@ jobs:
     name: "Python: 3.9 on Linux"
     python: "3.9"
     env: TOXENV=py39-cov
+  - stage: test
+    name: "Python: 3.10 on Linux"
+    python: "3.10"
+    env: TOXENV=py310-cov
+  - stage: test
+    name: "Python: 3.11 on Linux"
+    python: "3.11"
+    env: TOXENV=py311-cov
   - stage: test
     name: "Python: pypy3 on Linux"
     python: "pypy3"
@@ -124,24 +124,4 @@ jobs:
       - python -m pip install --upgrade pip
     env:
       - PATH=/c/Python38:/c/Python38/Scripts:$PATH
-      - TOXENV=py38-cov
-  - stage: test
-    name: "Python: 3.7.4 on macOS"
-    os: osx
-    osx_image: xcode11.2  # Python 3.7.4 running on macOS 10.14.4
-    language: shell       # 'language: python' is an error on Travis CI macOS
-    env: TOXENV=py37-cov
-  - stage: deploy
-    python: '3.7' # only run once
-    install: skip
-    script: skip
-    deploy:
-      - provider: pypi
-        username: __token__
-        distributions: "sdist bdist_wheel"
-        password:
-          secure: "Yo1GgXnDX8br7Gwy7IbIbTowfbuATV8hwMoWeQEfXb/rkPxJuElbGDb6xEy19E3qojxMbeY2Lm5ahyRXBcQmekyzG4/xa4aLqxa08TEYbH/QQi3T7pFaIpBdPwHE3e3dsKZIFJwFwPymjIBZGC79CQkkD2g2+9GvSSJVkc5OMY/q1rVeWeKxbNmLiSu9kIIusBt1nkmrctLaNNN6fRvjII61bxkujpmBjWGZcNmcVHqxXqEVplfAOhBymalrhl6ABtlzKxLoBWJchqILLsVGoIhHIcUFkA7PyH90UfR5k2mWh7W5kh44vbY4F/OV2Dr875RNc/BYfnNe/RofxtIg1B9Z5JLVpGXsUhfWBqDcymym+ugTdYwEL2D4S2cWEK5sSur+cb/Ib/CAwYUaVf6eWJERzsPKs+5bfHHpkphDUIs7Rp6Mf5bkPgiUgbyWQ0Wdx5a7WXqwHCVpskCDreCF54X4FQuHeSxXrOVQ1GnknpTm5ZCJhuB5ged1a6BmhzF4LbhalHZjmYqy37j+jCLAa8QrpoUkhvPrSKyUQVHnj8P8yw2jydHDdyuWoibwL+rbrHHeX66QreV/utBODfbx2j3tMzkAU8QqKsmP9hWnHFx5Lz6Dl/m8MniKbs7B3vMG3MCJsPz2nawHC/wlDeRqTTARZ+Fpc7VHzj2/ra8Egos="
-        on:
-          # Limitation on branches is done in the "stages" section, so if
-          # the stage is executed, we always want to deploy
-          all_branches: true
+      - TOXENV=py38-cov

CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.14.1]
+
+### Changed
+
+* Pins `urllib3` to prevent `request` from breaking [#134]
+
+### Added
+* Support for Python 3.10 and 3.11
+
+### Deprecated
+
+* Drops support for Python 3.6 and 3.7
+
+[#134]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/134
+
 ## [0.14.0]
 
 ### Changed
@@ -296,7 +311,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.14.0...HEAD
+[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.14.1...HEAD
+[0.14.1]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/rel/0.14.0...rel/0.14.1
 [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

README.md

@@ -43,14 +43,16 @@ pay attention to the [CHANGELOG.md].
 # Requirements
 
 To use the SDK, you will need a recent version of Python. We actively support
-and test Python ~~3.5~~ 3.6 up to Python 3.9. We aim to support all officially supported
+and test Python ~~3.5~~ ~~3.6~~ 3.8,  3.9, 3.10 and 3.11. We aim to support all officially supported
 Python version. This includes any Python version not
 listed as `end-of-life` in the
 [Python Developer's Guide](https://devguide.python.org/#branchstatus). You can check
 the [Travis builds] to see which environments are actively tested.
 
 **NOTE:** Python 3.5 is [end-of-life since September 2021](https://www.python.org/downloads/release/python-3510/).
 The SDK will **remove support** for Python 3.5 at some point after the 0.8.0 release.
+* **Python 3.5 support dropped in version `0.14.0`**
+* **Python 3.6 and 3.7 dropped in version `0.14.1`**
 
 Additionally, the `pip` and `virtualenv` tools should be installed. See
 the [installation instructions][pip and virtual environments].

requirements.txt

@@ -1,3 +1,4 @@
 cfenv==0.5.3
 requests==2.25.1
 typing-extensions==4.0.0
+urllib3~=1.25

setup.py

@@ -5,7 +5,7 @@
 
 
 def get_version():
-    with open("version.txt") as ver_file:
+    with open("version.txt", encoding="utf-8") as ver_file:
         version_str = ver_file.readline().rstrip()
     return version_str
 
@@ -31,20 +31,21 @@ def get_long_version():
         "requests~=2.20",
         "typing-extensions~=4.0",
         "cfenv~=0.5",
+        "urllib3~-1.25",
     ],
     packages=find_packages(exclude=["tests"]),
     include_package_data=True,
-    python_requires="~=3.6",
+    python_requires="~=3.8",
     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.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Environment :: Console",

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 # exclude "system_tests" by default: these need service credentials
-envlist = py36, py37, py38, py39
+envlist = py38, py39, py310, py311
 
 [testenv]
 whitelist_externals = mkdir

version.txt

@@ -1 +1 @@
-0.14.0
+0.14.1