Compare commits

...

2 commits

Author SHA1 Message Date
52d92da907
Upgraded license date.
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-27 15:12:45 +02:00
88cc18de92
Replaced remaining setup.py references in the code with pyproject.toml. 2024-07-27 15:12:19 +02:00
7 changed files with 7 additions and 8 deletions

View file

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2017, 2020 Fabio Manganiello Copyright (c) 2017, 2024 Fabio Manganiello
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View file

@ -7,7 +7,7 @@ WORKDIR /var/lib/platypush
RUN --mount=type=bind,source=.,target=/curdir \ RUN --mount=type=bind,source=.,target=/curdir \
apk update && \ apk update && \
# If the current directory is the Platypush repository, then we can copy the existing files \ # If the current directory is the Platypush repository, then we can copy the existing files \
if grep 'name="platypush"' /curdir/setup.py >/dev/null 2>&1; \ if grep 'name="platypush"' /curdir/pyproject.toml >/dev/null 2>&1; \
then \ then \
cp -r /curdir /install; \ cp -r /curdir /install; \
# Otherwise, we need to clone the repository \ # Otherwise, we need to clone the repository \

View file

@ -10,7 +10,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \ RUN --mount=type=bind,source=.,target=/curdir \
apt update && \ apt update && \
# If the current directory is the Platypush repository, then we can copy the existing files \ # If the current directory is the Platypush repository, then we can copy the existing files \
if grep 'name="platypush"' /curdir/setup.py >/dev/null 2>&1; \ if grep 'name="platypush"' /curdir/pyproject.toml >/dev/null 2>&1; \
then \ then \
cp -r /curdir /install; \ cp -r /curdir /install; \
# Otherwise, we need to clone the repository \ # Otherwise, we need to clone the repository \

View file

@ -7,7 +7,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \ RUN --mount=type=bind,source=.,target=/curdir \
# If the current directory is the Platypush repository, then we can copy the existing files \ # If the current directory is the Platypush repository, then we can copy the existing files \
if grep 'name="platypush"' /curdir/setup.py >/dev/null 2>&1; \ if grep 'name="platypush"' /curdir/pyproject.toml >/dev/null 2>&1; \
then \ then \
cp -r /curdir /install; \ cp -r /curdir /install; \
# Otherwise, we need to clone the repository \ # Otherwise, we need to clone the repository \

View file

@ -10,7 +10,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \ RUN --mount=type=bind,source=.,target=/curdir \
apt update && \ apt update && \
# If the current directory is the Platypush repository, then we can copy the existing files \ # If the current directory is the Platypush repository, then we can copy the existing files \
if grep 'name="platypush"' /curdir/setup.py >/dev/null 2>&1; \ if grep 'name="platypush"' /curdir/pyproject.toml >/dev/null 2>&1; \
then \ then \
cp -r /curdir /install; \ cp -r /curdir /install; \
# Otherwise, we need to clone the repository \ # Otherwise, we need to clone the repository \

View file

@ -91,8 +91,7 @@ class VenvBuilder(BaseBuilder):
Otherwise, the source directory will be cloned from git into a Otherwise, the source directory will be cloned from git into a
temporary folder. temporary folder.
""" """
setup_py_path = os.path.join(os.getcwd(), 'setup.py') if os.path.isfile(os.path.join(os.getcwd(), 'pyproject.toml')):
if os.path.isfile(setup_py_path):
logger.info('Using local checkout of the Platypush source code') logger.info('Using local checkout of the Platypush source code')
yield os.getcwd() yield os.getcwd()
else: else:

View file

@ -17,7 +17,7 @@ def parse_deps(deps):
ret = [] ret = []
for dep in deps: for dep in deps:
if dep.startswith('git+'): if dep.startswith('git+'):
continue # Don't include git dependencies in the setup.py, or Twine will complain continue # Don't include git dependencies in pip, or Twine will complain
ret.append(dep) ret.append(dep)