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.

Sign up for GitHub

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

Jump to bottom

Update fs.expose.ftp for compatibility with latest pyftpdlib. #217

Closed
wants to merge 25 commits into from
Closed

Update fs.expose.ftp for compatibility with latest pyftpdlib. #217

wants to merge 25 commits into from

Conversation

travcunn
Copy link

@travcunn travcunn commented Oct 7, 2015

The pyftpdlib project has moved some imports that will be problematic when a new release is created. This should be merged as soon as pyftpdlib creates a new release (newer than 1.4).

@willmcgugan
Copy link
Member

I guess I should pin pyfilesystem to pyftpdlib 1.4?

@kitsmag kitsmag mentioned this pull request Jan 7, 2016
Open
@lurch
Copy link
Contributor

lurch commented Jan 7, 2016

@travcunn Could you please rework this PR so that it only contains commit 08bac4b and not the unrelated commits?
(Easiest method might be to close this PR, create a new branch, recreate your fixes there, and submit a PR from that branch?)

@kitsmag
Copy link

kitsmag commented Jan 7, 2016

A git rebase plus git push -f might work, too

@zommuter zommuter mentioned this pull request Jan 8, 2016
Closed
@kitsmag
Copy link

kitsmag commented Jan 8, 2016

I took the liberty of re-requesting #217 without the unrelated parts as #239 (also, I put this account to rest and use my private one, @zommuter)

@zommuter zommuter mentioned this pull request Jan 11, 2016
Open
Jessica Luke and others added 17 commits April 18, 2016 16:09
Add some basic information instead of returning blank info for the root
6fc97b5
Merge pull request #1 from smartfile/add-basic-info
8e6ae64 
Add some basic information instead of returning blank info for the root
@giampaolo
bypass lock on move()
c913806
@giampaolo
bypass lock on setcontents()
e733d72
@giampaolo
bypass_lock on movedir
41ba462
@giampaolo
Merge pull request #2 from smartfile/lockfs
af1afdd 
lockfs
@giampaolo
modify all setcontents() signatures in order to accept a 'bypass_lock…
d733cab 
…' arg
@giampaolo
fix import error
c8d2708
@giampaolo
use **kwargs in copy() signature
e91a4c7
@giampaolo
add **kwargs to removedir() signature
d2e18b9
@giampaolo
add **kwargs to movedir() signature
8d2a2b4
@giampaolo
add Maefile + test runner
240b0e3
Merge pull request #3 from smartfile/bypass-lock-arg
051124c 
Bypass lock arg
@giampaolo
skip failing tests which are also failing on pyfilesystem master branch
378c403
@giampaolo
add pyftpdlib to setup.py requirements
eae6850
@giampaolo
skip libarchive test if not available (and we don't use it anyway=
999b814
@giampaolo
skip test failing on master
2df37d5
@lurch
Copy link
Contributor

lurch commented Aug 1, 2016

Closing in favour of #243

@lurch lurch closed this Aug 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@travcunn @willmcgugan @lurch @kitsmag @giampaolo