From 4f1e3bc8a8f4af90167337f22f3c8a5102407168 Mon Sep 17 00:00:00 2001 From: Borja Lopez Date: Tue, 21 Dec 2021 10:37:22 +0100 Subject: [PATCH 1/2] Ensure the typing package is installed only if needed (python < 3.5) This prevents problems when installing cortex4py in recent python versions, where typing is installed as an external package, while there is a typing module included in the stdlib. The external package then "shadows" the stdlib module, breaking other packages that use/rely on typing (when using cortex4py in a project with more dependencies) --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 57d00e7..41d269d 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,12 @@ print("warning: pypandoc module not found, could not convert Markdown to RST") read_md = lambda f: open(f, 'r').read() +install_requires = [ + 'typing;python_version<"3.5"', + 'requests', + 'python-magic' +] + setup( name='cortex4py', version='2.1.0', @@ -33,5 +39,5 @@ 'Topic :: Software Development :: Libraries :: Python Modules' ], include_package_data=True, - install_requires=['typing', 'requests', 'python-magic'] + install_requires=install_requires ) From 649f9d0b5bb96665ec3b715c78b62a03eb5baff4 Mon Sep 17 00:00:00 2001 From: Mauro Molino Date: Thu, 24 Feb 2022 10:02:44 +0000 Subject: [PATCH 2/2] test --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..e69de29