Release 0.5.4

Drop python3.6 support
servefile still works with python3.6, we just no longer test this.
2023-01-23 23:40:14 +01:00 · 2023-01-23 23:40:14 +01:00 · 2023-01-23 23:40:14 +01:00 · 2023-01-23 23:40:14 +01:00 · 2022-01-18 22:52:44 +01:00 · 2022-01-18 21:33:15 +01:00
7 changed files with 1051 additions and 963 deletions
--- a/.github/workflows/run-tox.yml
+++ b/.github/workflows/run-tox.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python: [2.7, 3.7, 3.8, 3.9, "3.10", 3.11]

    steps:
      - uses: actions/checkout@v2
@ -23,3 +23,15 @@ jobs:
        run: pip install tox
      - name: Run Tox
        run: tox -e py
+  pep8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install Tox
+        run: pip install tox
+      - name: Run Tox pep8
+        run: "tox -e pep8"
--- a/11
+++ b/11
@ -1,6 +1,17 @@
 servefile changelog
 ===================

+2023-01-23 v0.5.4
+-----------------
+
+	0.5.4 released
+
+	* code reformatting for better maintainability
+	* upload to uploaddir instead of /tmp for large files
+	* add python3.10 / python3.11 support
+	* drop python3.6 support
+
+
 2021-11-18 v0.5.3
 -----------------

--- a/servefile.1
+++ b/servefile.1
@ -1,4 +1,4 @@
-.TH SERVEFILE 1 "November 2021" "servefile 0.5.3" "User Commands"
+.TH SERVEFILE 1 "January 2023" "servefile 0.5.4" "User Commands"

 .SH NAME
 servefile \- small HTTP-Server for temporary file transfer
--- a/servefile/servefile.py
+++ b/servefile/servefile.py
--- a/setup.py
+++ b/setup.py
@ -11,7 +11,7 @@ setup(
    long_description=long_description,
    long_description_content_type='text/markdown',
    platforms='posix',
-    version='0.5.3',
+    version='0.5.4',
    license='GPLv3 or later',
    url='https://github.com/sebageek/servefile/',
    author='Sebastian Lohff',
@ -38,10 +38,11 @@ setup(
        'Programming Language :: Python :: 2',
        'Programming Language :: Python :: 2.7',
        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
        'Programming Language :: Python :: 3.7',
        'Programming Language :: Python :: 3.8',
        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
        'Topic :: Communications',
        'Topic :: Communications :: File Sharing',
        'Topic :: Internet',
--- a/tests/test_servefile.py
+++ b/tests/test_servefile.py
@ -146,7 +146,7 @@ def _test_version(run_servefile, standalone):
        version = s.stdout.readline().decode().strip()

    # hardcode version as string until servefile is a module
-    assert version == 'servefile 0.5.3'
+    assert version == 'servefile 0.5.4'


 def test_version(run_servefile):
@ -357,6 +357,20 @@ def test_upload_size_limit(run_servefile, tmp_path):
    assert r.status_code == 200


+def test_upload_large_file(run_servefile, tmp_path):
+    # small files end up in BytesIO while large files get temporary files. this
+    # test makes sure we hit the large file codepath at least once
+    uploaddir = tmp_path / 'upload'
+    run_servefile(['-u', str(uploaddir)])
+
+    data = "asdf" * 1024
+    files = {'file': ('more_data.txt', data)}
+    r = _retry_while(ConnectionError, make_request)(method='post', files=files)
+    assert r.status_code == 200
+    with open(str(uploaddir / 'more_data.txt')) as f:
+        assert f.read() == data
+
+
 def test_tar_mode(run_servefile, datadir):
    d = {
        'foo': {
--- a/tox.ini
+++ b/tox.ini
@ -1,9 +1,19 @@
 [tox]
-envlist = py27,py36,py37,py38,py39
+envlist = py27,py37,py38,py39,py310,py311,pep8

 [testenv]
 deps =
        pathlib2; python_version<"3"
        pytest
        requests
+        flake8
 commands = pytest -v --tb=short {posargs}
+
+[testenv:pep8]
+commands = flake8 servefile/ {posargs}
+
+[flake8]
+show-source = True
+max-line-length = 120
+ignore = E123,E125,E241,E402,E741,W503,W504,H301
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
Author	SHA1	Message	Date
Sebastian Lohff	f668fc3fe6	Release 0.5.4	2023-01-23 23:40:14 +01:00
Sebastian Lohff	9784c82679	Drop python3.6 support servefile still works with python3.6, we just no longer test this.	2023-01-23 23:40:14 +01:00
Sebastian Lohff	f23dfd2a51	Ignore python3.11 cgi deprecation warning The cgi module is marked as deprecated and will be removed in python3.13. servefile uses the module for its FieldStorage class used in the upload functionality. For now I will just ignore this, so servefile doesn't print out the warning each time it is run, but soon this will require either a rewrite of FieldStorage or an external library. With this commit we also now officially support python3.10 and python3.11.	2023-01-23 23:40:14 +01:00
Sebastian Lohff	b1145af6bb	Code formatting * removed weird linebreaks for for-loop * no () for del statement	2023-01-23 23:40:14 +01:00
MasterofJOKers	0b010d5c10	Upload to uploaddir instead of /tmp When uploading larger files, cgi.FieldStorage decides to store the files in an unnamed temporary file in /tmp while parsing the form-data. This is counter-intuitive and might not work, if the partition hosting /tmp/ is too small. Therefore, we overwrite FieldStorage's make_file() method to use the targetDir as upload path. While we're at it, we also use NamedTemporaryFile instead of TemporaryFile, because that lets us use os.link() to create a "copy" of the file-data without writing it to disk a second time. This does not work for small data, because small data is kept in an BytesIO object and thus never written to file automatically. For this case, we keep the old code, that's writing down files manually. We have to inline-define CustomFieldStorage, because FieldStorage will instantiate a new FieldStorage instance for parsing the parts of a multipart/form-data body and thus we cannot pass targetDir via __init__() argument. Signed-off-by: MasterofJOKers <joker@someserver.de>	2022-01-18 22:52:44 +01:00
Sebastian Lohff	4f3b916b9f	Add pep8 check to tox and GitHub actions	2022-01-18 21:33:15 +01:00
Sebastian Lohff	5dcf364e0f	Code formatting: Whitespace around operators	2022-01-18 21:33:15 +01:00
Sebastian Lohff	aa54e8536a	Further codeformatting * break up some extra long lines * add a bit of noqa for warnings I don't want to have * rework formatting for ip addr / ifconfig part	2022-01-18 21:33:15 +01:00
Sebastian Lohff	96e9e76ff4	Code reformatting * replace tabs with spaces * replace some of the != None with is not None etc. * more whitespace fixes * remove all the newline \	2022-01-18 21:33:15 +01:00