Skip to content

Commit

Permalink
Replaced remaining setup.py references in the code with pyproject.toml.
Browse files Browse the repository at this point in the history
  • Loading branch information
blacklight committed Jul 27, 2024
1 parent fb99eef commit 88cc18d
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion platypush/install/docker/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion platypush/install/docker/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion platypush/install/docker/fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion platypush/install/docker/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions platypush/platyvenv/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ def _prepare_src_dir(self) -> Generator[str, None, None]:
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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 88cc18d

Please sign in to comment.