Skip to content

Commit 1e22d2e

Browse files
sybrenstuvelsybrenstuvel
committed
Drop support for Python 2 and 3.4
Some of our development dependencies, like Sphinx, have already dropped support for Python 2. This makes it harder for this project to update its dependencies. Since Python 2 only has a few more months to live, I think it's fine to drop support now. Python 3.4 has already reached its end-of-life date. Python-RSA now only supports Python 3.5 and newer. Python 3.5 support is intended to last until its end-of-life date of 2019-09-13: https://devguide.python.org/#status-of-python-branches
1 parent 7424c69 commit 1e22d2e

8 files changed

Lines changed: 246 additions & 196 deletions

File tree

‎.travis.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
language: python
2+
dist: bionic # required for Python >= 3.7
23
cache: pip
34

45
# Environment changes have to be manually synced with 'tox.ini'.
56
# See: https://github.com/travis-ci/travis-ci/issues/3024
67

7-
# Python 3.7 is not yet supported by Travis CI.
8-
# See: https://github.com/travis-ci/travis-ci/issues/9815
9-
108
python:
11-
- "2.7"
12-
- "3.4"
13-
- "3.5"
149
- "3.6"
15-
- "3.7-dev"
10+
- "3.7"
11+
12+
matrix:
13+
include:
14+
- python: 3.5
15+
dist: xenial # Bionic has no Python 3.5
1616

17-
# This is blocked by https://github.com/pypa/pipenv/issues/2449,
18-
# also see https://github.com/pypa/pipenv/projects/7
19-
# - "pypy"
20-
- "pypy3.5"
17+
# Disabled, see https://github.com/sybrenstuvel/python-rsa/issues/131
18+
#- python: pypy3.5
19+
# dist: xenial # Bionic has no Python 3.5
2120

2221
install:
2322
- pip install pipenv

‎CHANGELOG.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Python-RSA changelog
22
========================================
33

4+
Version 4.1 - in development
5+
----------------------------------------
6+
7+
- Dropped support for Python 2 and 3.4.
8+
- Move to Python 3.7 in Pipfile (so `pipenv install` creates a Python 3.7 virtualenv).
9+
10+
411
Version 4.0 - released 2018-09-16
512
----------------------------------------
613

‎Pipfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ pytest = "*"
1515
pytest-cov = "*"
1616
pathlib2 = {version = "*", markers="python_version < '3.6'"}
1717

18-
# Required by pytest, not sure why it's not being picked up.
19-
funcsigs = {version = "*", markers="python_version < '3.3'"}
20-
scandir = {version = "*", markers="python_version < '3.3'"}
21-
2218
[requires]
23-
python_version = "3.6"
19+
python_version = "3.7"

‎Pipfile.lock‎

Lines changed: 210 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ or download it from the [Python Package Index](https://pypi.org/project/rsa/).
2323
The source code is maintained at [GitHub](https://github.com/sybrenstuvel/python-rsa/) and is
2424
licensed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
2525

26+
Major changes in 4.1
27+
--------------------
28+
29+
Version 4.0 was the last version to support Python 2 and 3.4. Version 4.1 is compatible with Python 3.5+ only.
30+
2631

2732
Major changes in 4.0
2833
--------------------

‎doc/installation.rst‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Installation
22
============
33

4-
Installation can be done in various ways. The simplest form uses pip
5-
or easy_install. Either one will work::
4+
Installation can be done in various ways. The simplest form uses pip::
65

76
pip install rsa
87

98
Depending on your system you may need to use ``sudo pip`` if you want to install
10-
the library system-wide.
9+
the library system-wide, or use ``pip install --user rsa`` to install the
10+
library in your home directory.
1111

1212
Installation from source is also quite easy. Download the source and
1313
then type::
@@ -25,6 +25,9 @@ GitHub. It also hosts the `issue tracker`_.
2525
Dependencies
2626
------------
2727

28+
Python-RSA is compatible with Python versions 3.5 and newer. The last
29+
version with Python 2.7 support was Python-RSA 4.0.
30+
2831
Python-RSA has very few dependencies. As a matter of fact, to use it
2932
you only need Python itself. Loading and saving keys does require an
3033
extra module, though: pyasn1. If you used pip or easy_install like
@@ -34,17 +37,14 @@ described above, you should be ready to go.
3437
Development dependencies
3538
------------------------
3639

37-
In order to start developing on Python-RSA you need a bit more. Use
38-
pip to install the development requirements in a virtual environment::
39-
40-
virtualenv -p /path/to/your-python-version python-rsa-venv
41-
. python-rsa-venv/bin/activate
42-
pip install -r python-rsa/requirements.txt
40+
In order to start developing on Python-RSA, use Git_ to get a copy of
41+
the source::
4342

43+
git clone https://github.com/sybrenstuvel/python-rsa.git
4444

45-
Once these are installed, use Git_ to get a copy of the source::
45+
Use pipenv_ to install the development requirements in a virtual environment::
4646

47-
git clone https://github.com/sybrenstuvel/python-rsa.git
48-
python setup.py develop
47+
pipenv install --dev
4948

5049
.. _Git: https://git-scm.com/
50+
.. _pipenv: https://docs.pipenv.org/

‎setup.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@
4444
'License :: OSI Approved :: Apache Software License',
4545
'Operating System :: OS Independent',
4646
'Programming Language :: Python',
47-
'Programming Language :: Python :: 2',
48-
'Programming Language :: Python :: 2.7',
4947
'Programming Language :: Python :: 3',
50-
'Programming Language :: Python :: 3.4',
5148
'Programming Language :: Python :: 3.5',
5249
'Programming Language :: Python :: 3.6',
5350
'Programming Language :: Python :: 3.7',

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
# Environment changes have to be manually synced with '.travis.yml'.
3-
envlist = py27,py34,py35,py36,p37,pypy
3+
envlist = py35,py36,p37
44

55
[pytest]
66
addopts = -v --cov rsa --cov-report term-missing

0 commit comments

Comments
 (0)