Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Support for Python 3.5 #340

Merged
merged 4 commits into from
Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ jobs:
docker:
- image: circleci/python:3.6

linux-python-35:
<<: *linux-template
docker:
- image: circleci/python:3.5

linux-pypy-3:
<<: *linux-template
docker:
Expand Down Expand Up @@ -195,9 +190,6 @@ workflows:
- linux-python-36:
requires:
- pre-checks
- linux-python-35:
requires:
- pre-checks
- linux-pypy-3:
requires:
- linux-python-36
Expand All @@ -213,7 +205,6 @@ workflows:
branches:
only: /release\/.*/
requires:
- linux-python-35
- linux-python-36
- linux-python-37
- linux-python-38
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This makes it easier to operate on large data spaces, streamlines post-processin
## Installation

The recommended installation method for **signac** is through **conda** or **pip**.
The software is tested for Python 3.5+ and is built for all major platforms.
The software is tested for Python 3.6+ and is built for all major platforms.

To install **signac** *via* the [conda-forge](https://conda-forge.github.io/) channel, execute:

Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ Deprecated

- Deprecate the ``create_access_modules`` method in ``Project``, to be removed in 2.0 (#303, #308).

Removed
+++++++

- Dropped support for Python 3.5 (#340). The signac project will follow the `NEP 29 deprecation policy <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_ going forward.


[1.4.0] -- 2020-02-28
---------------------
Expand Down
5 changes: 3 additions & 2 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ Installation
============

The recommended installation method for **signac** is via conda_ or pip_.
The software is tested for Python versions 3.5+ and has minimal dependencies.
However, some extra features such as the HDF5 integration require additional packages.
The software is tested for Python versions 3.6+ and has minimal dependencies.
Some features such as the HDF5 integration require additional packages.
Supported Python and NumPy versions are determined according to the `NEP 29 deprecation policy <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_.

.. _conda: https://conda.io/
.. _conda-forge: https://conda-forge.org/
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"License :: OSI Approved :: BSD License",
"Topic :: Database",
"Topic :: Scientific/Engineering :: Physics",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
Expand All @@ -65,7 +64,9 @@

install_requires=requirements,

python_requires='>=3.5, <4',
# Supported versions are determined according to NEP 29.
# https://numpy.org/neps/nep-0029-deprecation_policy.html
python_requires='>=3.6, <4',

extras_require={
'db': ['pymongo>=3.0'],
Expand Down
11 changes: 3 additions & 8 deletions signac/contrib/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -922,14 +922,9 @@ def _open(cls, file, compresslevel=0):
if compresslevel > 0:
import gzip
with gzip.GzipFile(fileobj=file, mode='rb') as gzipfile:
if sys.version_info < (3, 6):
text = gzipfile.read().decode('utf-8')
docs = [json.loads(line) for line in text.splitlines()]
collection = cls(docs=docs)
else:
text_io = io.TextIOWrapper(gzipfile, encoding='utf-8')
collection = cls(docs=(json.loads(line) for line in text_io))
text_io.detach()
text_io = io.TextIOWrapper(gzipfile, encoding='utf-8')
collection = cls(docs=(json.loads(line) for line in text_io))
text_io.detach()
else:
collection = cls(docs=(json.loads(line) for line in file))
except (IOError, io.UnsupportedOperation) as error:
Expand Down
6 changes: 1 addition & 5 deletions signac/contrib/import_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# This software is licensed under the BSD 3-Clause License.
import os
import re
import sys
import errno
import shutil
import zipfile
Expand Down Expand Up @@ -543,10 +542,7 @@ def read_sp_manifest_file(path):
fn_manifest = _tarfile_path_join(path, project.Job.FN_MANIFEST)
try:
with closing(tarfile.extractfile(fn_manifest)) as file:
if sys.version_info < (3, 6):
return json.loads(file.read().decode())
else:
return json.loads(file.read())
return json.loads(file.read())
except KeyError:
pass

Expand Down
50 changes: 0 additions & 50 deletions tests/conda_create_config_host_test_env.sh

This file was deleted.

79 changes: 0 additions & 79 deletions tests/conda_create_test_env.sh

This file was deleted.