tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Remove some top-level packaging related to magic-folders

This commit is contained in:
Jean-Paul Calderone 2020-02-13 10:21:45 -05:00
parent 461f42e7bc
commit 76d667865e
No known key found for this signature in database
GPG Key ID: 86E6F8BAE797C287
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -42,12 +42,6 @@ upload-osx-pkg:
# echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \ # echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
# fi # fi
.PHONY: smoketest
smoketest:
-python ./src/allmydata/test/check_magicfolder_smoke.py kill
-rm -rf smoke_magicfolder/
python ./src/allmydata/test/check_magicfolder_smoke.py
# code coverage-based testing is disabled temporarily, as we switch to tox. # code coverage-based testing is disabled temporarily, as we switch to tox.
# This will eventually be added to a tox environment. The following comments # This will eventually be added to a tox environment. The following comments
# and variable settings are retained as notes for that future effort. # and variable settings are retained as notes for that future effort.

5
setup.py
View File

@ -62,9 +62,7 @@ install_requires = [
# version of cryptography will *really* be installed. # version of cryptography will *really* be installed.
"cryptography >= 2.6", "cryptography >= 2.6",
# * On Linux we need at least Twisted 10.1.0 for inotify support # * We need Twisted 10.1.0 for the FTP frontend in order for
# used by the drop-upload frontend.
# * We also need Twisted 10.1.0 for the FTP frontend in order for
# Twisted's FTP server to support asynchronous close. # Twisted's FTP server to support asynchronous close.
# * The SFTP frontend depends on Twisted 11.0.0 to fix the SSH server # * The SFTP frontend depends on Twisted 11.0.0 to fix the SSH server
# rekeying bug <https://twistedmatrix.com/trac/ticket/4395> # rekeying bug <https://twistedmatrix.com/trac/ticket/4395>
@ -354,7 +352,6 @@ setup(name="tahoe-lafs", # also set in __init__.py
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2392 for some # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2392 for some
# discussion. # discussion.
':sys_platform=="win32"': ["pywin32 != 226"], ':sys_platform=="win32"': ["pywin32 != 226"],
':sys_platform!="win32" and sys_platform!="linux2"': ["watchdog"], # For magic-folder on "darwin" (macOS) and the BSDs
"test": [ "test": [
# Pin a specific pyflakes so we don't have different folks # Pin a specific pyflakes so we don't have different folks
# disagreeing on what is or is not a lint issue. We can bump # disagreeing on what is or is not a lint issue. We can bump