[dependencies] update 3rd party dependencies

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.13.0
+current_version = 3.0.0
 commit = True
 tag = True
 tag_name = v{new_version}

.gitignore

@@ -127,4 +127,7 @@ tags
 # Persistent undo
 [._]*.un~
 
+# PyCharm
+.idea/
+
 # End of https://www.gitignore.io/api/vim,python

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-python: 3.6
+python: 3.9
 sudo: false
 env:
   - TOX_ENV=py27

Makefile

@@ -0,0 +1,12 @@
+
+start:
+	echo "Hello World!"
+
+requirements: requirements-test.txt
+
+requirements-test.txt: requirements-test.in requirements.txt
+	pip-compile -qU requirements-test.in
+
+requirements.txt: setup.py
+	pip-compile -qU setup.py
+

requirements-test.in

@@ -0,0 +1,13 @@
+-r requirements.txt
+python-dateutil
+mock
+pytest
+pytest-cov
+flake8
+pipenv
+
+# latest python-scrapinghub
+git+https://[email protected]/scrapinghub/python-scrapinghub.git@update_py310_minus_py27
+
+# CVE-2020-29651
+py>=1.10.0

requirements-test.txt

@@ -0,0 +1,115 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile requirements-test.in
+#
+attrs==21.2.0
+    # via pytest
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
+certifi==2021.10.8
+    # via
+    #   -r requirements.txt
+    #   pipenv
+    #   requests
+charset-normalizer==2.0.7
+    # via
+    #   -r requirements.txt
+    #   requests
+click==8.0.3
+    # via -r requirements.txt
+coverage[toml]==6.0.2
+    # via pytest-cov
+distlib==0.3.3
+    # via virtualenv
+docker==5.0.3
+    # via -r requirements.txt
+filelock==3.3.1
+    # via virtualenv
+flake8==4.0.1
+    # via -r requirements-test.in
+idna==3.3
+    # via
+    #   -r requirements.txt
+    #   requests
+iniconfig==1.1.1
+    # via pytest
+mccabe==0.6.1
+    # via flake8
+mock==4.0.3
+    # via -r requirements-test.in
+msgpack==1.0.2
+    # via scrapinghub
+packaging==21.0
+    # via pytest
+pipenv==2021.5.29
+    # via -r requirements-test.in
+platformdirs==2.4.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
+py==1.10.0
+    # via
+    #   -r requirements-test.in
+    #   pytest
+pycodestyle==2.8.0
+    # via flake8
+pyflakes==2.4.0
+    # via flake8
+pyparsing==3.0.0
+    # via packaging
+pytest==6.2.5
+    # via
+    #   -r requirements-test.in
+    #   pytest-cov
+pytest-cov==3.0.0
+    # via -r requirements-test.in
+python-dateutil==2.8.2
+    # via -r requirements-test.in
+pyyaml==6.0
+    # via -r requirements.txt
+requests==2.26.0
+    # via
+    #   -r requirements.txt
+    #   docker
+    #   scrapinghub
+retrying==1.3.3
+    # via
+    #   -r requirements.txt
+    #   scrapinghub
+git+https://[email protected]/scrapinghub/python-scrapinghub.git@update_py310_minus_py27
+    # via
+    #   -r requirements-test.in
+    #   -r requirements.txt
+six==1.16.0
+    # via
+    #   -r requirements.txt
+    #   python-dateutil
+    #   retrying
+    #   scrapinghub
+    #   virtualenv
+toml==0.10.2
+    # via
+    #   -r requirements.txt
+    #   pytest
+tomli==1.2.1
+    # via coverage
+tqdm==4.62.3
+    # via -r requirements.txt
+urllib3==1.26.7
+    # via
+    #   -r requirements.txt
+    #   requests
+virtualenv==20.9.0
+    # via pipenv
+virtualenv-clone==0.5.7
+    # via pipenv
+websocket-client==1.2.1
+    # via
+    #   -r requirements.txt
+    #   docker
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools

requirements.txt

@@ -1,43 +1,43 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile
+#    pip-compile setup.py
 #
-certifi==2020.6.20
+certifi==2021.10.8
     # via requests
-chardet==3.0.4
+charset-normalizer==2.0.7
     # via requests
-click==7.0
-    # via -r requirements.in
-docker==4.2.2
-    # via -r requirements.in
-idna==2.10
+click==8.0.3
+    # via shub (setup.py)
+docker==5.0.3
+    # via shub (setup.py)
+idna==3.3
     # via requests
-pyyaml==5.4
-    # via -r requirements.in
-requests==2.24.0
+pyyaml==6.0
+    # via shub (setup.py)
+requests==2.26.0
     # via
-    #   -r requirements.in
     #   docker
     #   scrapinghub
+    #   shub (setup.py)
 retrying==1.3.3
     # via
-    #   -r requirements.in
     #   scrapinghub
-scrapinghub==2.3.1
-    # via -r requirements.in
-six==1.15.0
+    #   shub (setup.py)
+#scrapinghub==2.3.1
+    # via shub (setup.py)
+git+https://[email protected]/scrapinghub/python-scrapinghub.git@update_py310_minus_py27
+six==1.16.0
     # via
-    #   -r requirements.in
-    #   docker
     #   retrying
     #   scrapinghub
-toml==0.10.1
-    # via -r requirements.in
-tqdm==4.55.1
-    # via -r requirements.in
-urllib3==1.25.9
+    #   shub (setup.py)
+toml==0.10.2
+    # via shub (setup.py)
+tqdm==4.62.3
+    # via shub (setup.py)
+urllib3==1.26.7
     # via requests
-websocket-client==0.57.0
+websocket-client==1.2.1
     # via docker

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='shub',
-    version='2.13.0',
+    version='3.0.0',
     packages=find_packages(exclude=('tests', 'tests.*')),
     url=about['DOCS_LINK'],
     description='Scrapinghub Command Line Client',
@@ -29,15 +29,14 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'click==7.0',
+        'click>=7.0',
         'docker',
-        'pip',
-        'PyYAML',
+        'pyyaml',
         'retrying',
         'requests',
         'scrapinghub>=2.3.1',
         'six>=1.7.0',
-        'tqdm==4.55.1',
+        'tqdm',
         'toml',
     ],
     classifiers=[
@@ -46,12 +45,10 @@
         'Natural Language :: English',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        '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',
         'Operating System :: OS Independent',
         'Environment :: Console',
         'Topic :: Internet :: WWW/HTTP',

shub/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.13.0'
+__version__ = '3.0.0'
 
 
 # Links to documentation to use over the project sources

shub/config.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 import netrc
 import os
-import warnings
 from collections import namedtuple
 
 import click
@@ -326,7 +325,8 @@ def _select_image_for_project(self, target, project):
 
     def get_target(self, target, auth_required=True):
         """Return (project_id, endpoint, apikey) for given target."""
-        warnings.warn("get_target is deprecated, use get_target_conf instead")
+        # WARNING: deprecating is just annoying because this library's unit tests still use this method
+        # warnings.warn("get_target is deprecated, use get_target_conf instead")
         targetconf = self.get_target_conf(target, auth_required=auth_required)
         return (
             targetconf.project_id,

shub/utils.py

@@ -11,7 +11,7 @@
 import time
 
 from collections import deque
-from six.moves.configparser import SafeConfigParser
+from six.moves.configparser import ConfigParser
 from distutils.spawn import find_executable
 from distutils.version import LooseVersion, StrictVersion
 from glob import glob
@@ -484,9 +484,9 @@ def inside_project():
 
 
 def get_config(use_closest=True):
-    """Get Scrapy config file as a SafeConfigParser"""
+    """Get Scrapy config file as a ConfigParser"""
     sources = get_sources(use_closest)
-    cfg = SafeConfigParser()
+    cfg = ConfigParser()
     cfg.read(sources)
     return cfg
 
@@ -505,7 +505,7 @@ def get_sources(use_closest=True):
 
 
 def get_scrapycfg_targets(cfgfiles=None):
-    cfg = SafeConfigParser()
+    cfg = ConfigParser()
     cfg.read(cfgfiles or [])
     baset = dict(cfg.items('deploy')) if cfg.has_section('deploy') else {}
     targets = {}