Compare commits

...

5 Commits
1.2.3 ... 1.2.6

7 changed files with 8 additions and 14 deletions

View File

@ -3,7 +3,7 @@
PROJECT := ahriman
FILES := AUTHORS COPYING CONFIGURING.md README.md package src setup.py
FILES := AUTHORS COPYING CONFIGURING.md README.md package src setup.cfg setup.py
TARGET_FILES := $(addprefix $(PROJECT)/, $(FILES))
IGNORE_FILES := package/archlinux src/.mypy_cache

View File

@ -1,7 +1,7 @@
# Maintainer: Evgeniy Alekseev
pkgname='ahriman'
pkgver=1.2.3
pkgver=1.2.6
pkgrel=1
pkgdesc="ArcHlinux ReposItory MANager"
arch=('any')

View File

@ -1,8 +1,6 @@
from build_manpages.build_manpages import build_manpages, get_build_py_cmd, get_install_cmd
from build_manpages import build_manpages
from pathlib import Path
from setuptools import setup, find_packages
from setuptools.command.build_py import build_py
from setuptools.command.install import install
from typing import Any, Dict
@ -103,8 +101,6 @@ setup(
},
cmdclass={
"build_manpages": build_manpages,
"build_py": get_build_py_cmd(build_py),
"install": get_install_cmd(install),
"build_manpages": build_manpages.build_manpages,
}
)

View File

@ -49,9 +49,7 @@ def _parser() -> argparse.ArgumentParser:
"--lock",
help="lock file",
type=Path,
default=Path(
tempfile.gettempdir()) /
"ahriman.lock")
default=Path(tempfile.gettempdir()) / "ahriman.lock")
parser.add_argument("--no-log", help="redirect all log messages to stderr", action="store_true")
parser.add_argument("--no-report", help="force disable reporting to web service", action="store_true")
parser.add_argument("--unsafe", help="allow to run ahriman as non-ahriman user", action="store_true")

View File

@ -148,6 +148,6 @@ class S3(Upload):
local_path = path / local_file
remote_path = Path(self.architecture) / local_file
(mime, _) = mimetypes.guess_type(local_path)
extra_args = {"Content-Type": mime} if mime is not None else None
extra_args = {"ContentType": mime} if mime is not None else None
self.bucket.upload_file(Filename=str(local_path), Key=str(remote_path), ExtraArgs=extra_args)

View File

@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
__version__ = "1.2.3"
__version__ = "1.2.6"

View File

@ -122,7 +122,7 @@ def test_upload_files(s3: S3, s3_remote_objects: List[Any], mocker: MockerFixtur
mock.call(
Filename=str(root / s3.architecture / "b"),
Key=f"{s3.architecture}/{s3.architecture}/b",
ExtraArgs={"Content-Type": "text/html"}),
ExtraArgs={"ContentType": "text/html"}),
mock.call(
Filename=str(root / s3.architecture / "d"),
Key=f"{s3.architecture}/{s3.architecture}/d",