diff options
| author | Ilya Etingof <etingof@gmail.com> | 2017-09-07 17:12:24 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2017-09-07 17:12:24 +0200 |
| commit | 061aac03057f49359c94bfbb8781751da15882b2 (patch) | |
| tree | 4dbcc751fb41234f4c3fe3e44c30df75edec851a | |
| parent | e7c1c076cdf5866a8c10d4848596cc5e2a89c688 (diff) | |
| download | pyasn1-modules-061aac03057f49359c94bfbb8781751da15882b2.tar.gz | |
0.1.3
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | pyasn1_modules/__init__.py | 2 | ||||
| -rw-r--r-- | pyasn1_modules/rfc2315.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 22 |
5 files changed, 20 insertions, 15 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 0c47875..9450017 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,11 @@ +Revision 0.1.3, released 07-09-2017 +----------------------------------- + +- Apparently, pip>=1.5.6 is still widely used and it is not PEP440 + compliant. Had to replace the `~=` version dependency spec with a + sequence of simple comparisons to remain compatible with the aging pip. + Revision 0.1.2, released 07-09-2017 ----------------------------------- diff --git a/pyasn1_modules/__init__.py b/pyasn1_modules/__init__.py index 68f6757..9ccea22 100644 --- a/pyasn1_modules/__init__.py +++ b/pyasn1_modules/__init__.py @@ -1,2 +1,2 @@ # http://www.python.org/dev/peps/pep-0396/ -__version__ = '0.1.2' +__version__ = '0.1.3' diff --git a/pyasn1_modules/rfc2315.py b/pyasn1_modules/rfc2315.py index b037c7f..cf732b0 100644 --- a/pyasn1_modules/rfc2315.py +++ b/pyasn1_modules/rfc2315.py @@ -7,7 +7,7 @@ # PKCS#7 message syntax # # ASN.1 source from: -# http://www.trl.ibm.com/projects/xml/xss4j/data/asn1/grammars/pkcs7.asn +# https://opensource.apple.com/source/Security/Security-55179.1/libsecurity_asn1/asn1/pkcs7.asn.auto.html # # Sample captures from: # openssl crl2pkcs7 -nocrl -certfile cert1.cer -out outfile.p7b diff --git a/requirements.txt b/requirements.txt index d8671d3..eee6225 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyasn1~=0.3.4 +pyasn1>=0.3.4,pyasn1<0.4.0 @@ -67,28 +67,26 @@ try: from setuptools import setup, Command params = { - 'zip_safe': True + 'zip_safe': True, + 'install_requires': ['pyasn1>=0.3.4,<0.4.0'] } - if sys.version_info[:2] < (2, 6): - params['install_requires'] = ['pyasn1>=0.3.4,<0.4.0'] - else: - params['install_requires'] = ['pyasn1~=0.3.4'] - except ImportError: for arg in sys.argv: if 'egg' in arg: howto_install_setuptools() sys.exit(1) - from distutils.core import setup, Command - params = {} + from distutils.core import setup, Command if sys.version_info[:2] > (2, 4): - if sys.version_info[:2] < (2, 6): - params['requires'] = ['pyasn1>=0.3.4,<0.4.0'] - else: - params['requires'] = ['pyasn1(~=0.3.4)'] + params = { + 'requires': ['pyasn1(>=0.3.4,<0.4.0)'] + } + else: + params = { + 'requires': ['pyasn1'] + } params.update( {'name': 'pyasn1-modules', |