Replaced remaining setup.py references in the code with pyproject.toml.

This commit is contained in:
Fabio Manganiello 2024-07-27 15:12:19 +02:00
parent fb99eefe40
commit 88cc18de92
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
6 changed files with 6 additions and 7 deletions

View file

@ -7,7 +7,7 @@ WORKDIR /var/lib/platypush
RUN --mount=type=bind,source=.,target=/curdir \
apk update && \
# 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 \
cp -r /curdir /install; \
# Otherwise, we need to clone the repository \

View file

@ -10,7 +10,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \
apt update && \
# 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 \
cp -r /curdir /install; \
# Otherwise, we need to clone the repository \

View file

@ -7,7 +7,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \
# 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 \
cp -r /curdir /install; \
# Otherwise, we need to clone the repository \

View file

@ -10,7 +10,7 @@ ENV DOCKER_CTX=1
RUN --mount=type=bind,source=.,target=/curdir \
apt update && \
# 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 \
cp -r /curdir /install; \
# 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
temporary folder.
"""
setup_py_path = os.path.join(os.getcwd(), 'setup.py')
if os.path.isfile(setup_py_path):
if os.path.isfile(os.path.join(os.getcwd(), 'pyproject.toml')):
logger.info('Using local checkout of the Platypush source code')
yield os.getcwd()
else:

View file

@ -17,7 +17,7 @@ def parse_deps(deps):
ret = []
for dep in deps:
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)