Skip to content

Commit

Permalink
Support Py3.8, drop 3.4, and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mar10 committed Dec 26, 2019
1 parent 7a4c15d commit 479e0d4
Show file tree
Hide file tree
Showing 10 changed files with 319 additions and 48 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
sudo: false
language: python
dist: xenial # Ubuntu 16, required for Python 3.7+
python:
- "2.7"
# - "3.3" # End-of-life September 2017
- "3.4"
# - "3.3" # End-of-life September 2017
# - "3.4" # End-of-life March 2019
- "3.5"
- "3.6"
- "3.7"
dist: xenial # Ubuntu 16, required for Python 3.7
- "3.8"
install:
- pip install tox-travis
- pip install flake8
Expand Down
7 changes: 6 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
3.0.1 (unreleased)
3.1.1 (unreleased)
------------------

3.1.0 (2020-12-26)
------------------
- Drop support for Python 3.4 (end-of-life: 2019-03-18)
- Add support for Python 3.8
- Fix #38 Remove trailing '/' before checking PWD response

3.0.0 (2019-04-20)
Expand Down
8 changes: 5 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ flake8-quotes = "~=1.0"
black = "*"
isort = "*"
pylint = "*"
pyftpsync = {editable = true,path = "."}
tox = "*"

[packages]
colorama = "==0.3.9"
keyring = "==5.3"
PyYAML = "==5.1"
colorama = "==0.4.3"
keyring = "==18.0.1"
PyYAML = "==5.2"

[pipenv]
allow_prereleases = true
323 changes: 293 additions & 30 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Make sure to adjust your scripts accordingly after update.

## Quickstart

[Python](https://www.python.org/download/Python) 2.7+ or 3.4+ is required,
[Python](https://www.python.org/download/Python) 2.7+ or 3.5+ is required,
[pip](http://www.pip-installer.org/) recommended:

```bash
Expand Down
6 changes: 3 additions & 3 deletions docs/sphinx/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ Work in a Virtual Environment
Install Python
^^^^^^^^^^^^^^
We need `Python 2.7 <https://www.python.org/downloads/>`_,
`Python 3.4+ <https://www.python.org/downloads/>`_,
`Python 3.5+ <https://www.python.org/downloads/>`_,
and `pip <https://pip.pypa.io/en/stable/installing/#do-i-need-to-install-pip>`_ on our system.

If you want to run tests on *all* supported platforms, install Python 2.7, 3.4,
3.5, and 3.6.
If you want to run tests on *all* supported platforms, install Python 2.7, 3.5,
3.6, 3.7, and 3.8.

Create and Activate the Virtual Environment
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion ftpsync/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
Developmental release (to mark 3.0.0 as 'used'. Don't publish this):
'3.0.0.dev1'
"""
__version__ = "3.0.0.dev1"
__version__ = "3.1.0"
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
colorama==0.3.9
keyring==5.3
PyYAML==5.1
colorama==0.4.3
keyring==18.0
PyYAML==5.2
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ def run(self):
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Utilities",
],
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
envlist =
check,
py27,
py34,
py35,
py36,
py37
py37,
py38

[testenv]
# Pass environment vars (delimit with spaces)
Expand Down

0 comments on commit 479e0d4

Please sign in to comment.