Skip to content
Snippets Groups Projects
Commit be8ca54b authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-drop-36-and-37' into 'dev'

MAINT: Drop support for Python 3.6 and 3.7

See merge request !61
parents 0893c56b 8b6d2eec
No related branches found
No related tags found
1 merge request!61MAINT: Drop support for Python 3.6 and 3.7
Pipeline #24348 passed
...@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed ### ### Removed ###
* Support for Python 3.6 and Python 3.7
### Fixed ### ### Fixed ###
### Security ### ### Security ###
......
* caosdb-server >= 0.7.2 * caosdb-server >= 0.7.2
* Python >= 3.6 * Python >= 3.8
* pip >= 20.0.2 * pip >= 20.0.2
Any other dependencies are defined in the setup.py and are being installed via pip Any other dependencies are defined in the setup.py and are being installed via pip
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
### Requirements ### ### Requirements ###
PyCaosDB needs at least Python 3.6. Additionally, the following packages are required (they will PyCaosDB needs at least Python 3.8. Additionally, the following packages are required (they will
typically be installed automatically): typically be installed automatically):
- `lxml` - `lxml`
...@@ -19,7 +19,7 @@ Optional packages: ...@@ -19,7 +19,7 @@ Optional packages:
#### Linux #### #### Linux ####
Make sure that Python (at least version 3.6) and pip is installed, using your system tools and Make sure that Python (at least version 3.8) and pip is installed, using your system tools and
documentation. documentation.
Then open a terminal and continue in the [Generic installation](#generic-installation) section. Then open a terminal and continue in the [Generic installation](#generic-installation) section.
......
...@@ -168,7 +168,7 @@ def setup_package(): ...@@ -168,7 +168,7 @@ def setup_package():
"Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Information Analysis",
], ],
packages=find_packages('src'), packages=find_packages('src'),
python_requires='>=3.6', python_requires='>=3.8',
package_dir={'': 'src'}, package_dir={'': 'src'},
install_requires=['lxml>=4.6.3', install_requires=['lxml>=4.6.3',
'PyYAML>=6.0', 'future', 'PySocks>=1.6.7'], 'PyYAML>=6.0', 'future', 'PySocks>=1.6.7'],
......
...@@ -176,16 +176,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection): ...@@ -176,16 +176,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
if "ssl_version" in config and config["cacert"] is not None: if "ssl_version" in config and config["cacert"] is not None:
ssl_version = getattr(ssl, config["ssl_version"]) ssl_version = getattr(ssl, config["ssl_version"])
else: else:
try: ssl_version = ssl.PROTOCOL_TLS
ssl_version = ssl.PROTOCOL_TLS
except AttributeError:
# deprecated since Python 3.6, but necessary until there.
try:
ssl_version = ssl.PROTOCOL_TLSv1_2
except AttributeError:
print("It seems as if your Python version does not support current encryption"
"standards (such as TLS > 1.0), please upgrade to at least Python 3.4.")
sys.exit(1)
context = ssl.SSLContext(ssl_version) context = ssl.SSLContext(ssl_version)
context.verify_mode = ssl.CERT_REQUIRED context.verify_mode = ssl.CERT_REQUIRED
......
[tox] [tox]
envlist=py36, py37, py38, py39, py310 envlist=py38, py39, py310
skip_missing_interpreters = true skip_missing_interpreters = true
[testenv] [testenv]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment