Align setup.py to requirements.txt

[lourot]

keyring 21 depends on secretstorage>=3.2, so if we pin
secretstorage<2.4 we also must pin keyring<21. This is
what we do in requirements.txt already so this commit
is just aligning setup.py.

Checklist

• Are all your commits [logically] grouped and squashed appropriately?
• Does this patch have code coverage?
• Does your code pass make test?

[lourot]

FYI this was discovered by working on openstack-charmers/release-tools#125

[lourot]

Here an instance of failure without this fix:

build installdeps: -r/var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/requirements.txt
build installed: You are using pip version 8.1.1, however version 20.3.1 is available.,You should consider upgrading via the 'pip install --upgrade pip' command.,appdirs==1.4.4,blessings==1.6,certifi==2020.11.8,cffi==1.14.4,chardet==3.0.4,charm-tools==2.7.8,Cheetah3==3.2.6,colander==1.7.0,cryptography==3.2.1,dict2colander==0.2,distlib==0.3.1,distro==1.5.0,filelock==3.0.12,httplib2==0.18.1,idna==2.10,importlib-metadata==3.1.1,importlib-resources==1.0.2,ipaddress==1.0.23,iso8601==0.1.13,jeepney==0.6.0,jsonschema==2.5.1,jujubundlelib==0.5.6,keyring==21.5.0,launchpadlib==1.10.13,lazr.restfulclient==0.14.3,lazr.uri==1.0.5,libcharmstore==0.0.9,macaroonbakery==1.3.1,ndg-httpsclient==0.3.3,oauthlib==3.1.0,otherstuf==1.1.0,parse==1.18.0,path==15.0.0,path.py==12.5.0,pathspec==0.3.4,pbr==5.5.1,pkg-resources==0.0.0,protobuf==3.14.0,pyasn1==0.1.9,pycparser==2.20,pymacaroons==0.13.0,PyNaCl==1.4.0,pyOpenSSL==16.0.0,pyRFC3339==1.1,pytz==2020.4,PyYAML==3.13,requests==2.25.0,requirements-parser==0.2.0,ruamel.yaml==0.15.100,SecretStorage==2.3.1,simplejson==3.17.2,six==1.15.0,stuf==0.9.16,testresources==2.0.1,theblues==0.5.2,translationstring==1.4,urllib3==1.26.2,vergit==1.0.2,virtualenv==20.2.1,wadllib==1.3.4,zipp==3.4.0
build run-test-pre: PYTHONHASHSEED='0'
build run-test: commands[0] | charm-build --log-level DEBUG -o /var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/build src
Traceback (most recent call last):
  File "/var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/.tox/build/lib/python3.5/site-packages/pkg_resources/__init__.py", line 635, in _build_master
    ws.require(__requires__)
  File "/var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/.tox/build/lib/python3.5/site-packages/pkg_resources/__init__.py", line 943, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/.tox/build/lib/python3.5/site-packages/pkg_resources/__init__.py", line 834, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (SecretStorage 2.3.1 (/var/lib/jenkins/workspace/charm_pusher_ceph-fs_master/ceph-fs/.tox/build/lib/python3.5/site-packages), Requirement.parse('SecretStorage>=3.2; sys_platform == "linux"'), {'keyring'})

http://osci:8080/job/charm_pusher_ceph-fs_master/88/console

[fnordahl]

👍