Skip to content

Commit b72f49e

Browse files
author
atollk
committed
Merge branch 'master' into issue_456
# Conflicts: # CHANGELOG.md # fs/copy.py
2 parents 9f67f70 + 5f73778 commit b72f49e

File tree

4 files changed

+983
-310
lines changed

4 files changed

+983
-310
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88

99
## Unreleased
1010

11+
### Added
12+
13+
- Added `fs.copy.copy_file_if`, `fs.copy.copy_dir_if`, and `fs.copy.copy_fs_if`.
14+
Closes [#458](https://github.com/PyFilesystem/pyfilesystem2/issues/458).
15+
1116
### Changed
1217

1318
- FTP servers that do not support the MLST command now try to use the MDTM command to
1419
retrieve the last modification timestamp of a resource.
1520
Closes [#456](https://github.com/PyFilesystem/pyfilesystem2/pull/456).
21+
22+
### Fixed
23+
24+
- Fixed performance bugs in `fs.copy.copy_dir_if_newer`. Test cases were adapted to catch those bugs in the future.
1625

1726

1827
## [2.4.13] - 2021-03-27

appveyor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ environment:
2020

2121
install:
2222
# We need wheel installed to build wheels
23-
- "%PYTHON%\\python.exe -m pip install pytest pytest-randomly pytest-cov psutil pyftpdlib mock"
23+
- "%PYTHON%\\python.exe -m pip install -U pip wheel setuptools"
24+
- "%PYTHON%\\python.exe -m pip install pytest"
25+
- "%PYTHON%\\python.exe -m pip install -r tests/requirements.txt"
2426
- "%PYTHON%\\python.exe setup.py install"
2527

2628
build: off
2729

2830
test_script:
29-
- "%PYTHON%\\python.exe -m pytest -v tests"
31+
- "%PYTHON%\\python.exe -m pytest"

0 commit comments

Comments
 (0)