Skip to content

Commit

Permalink
Merge 242cbd3 into 4b54a5a
Browse files Browse the repository at this point in the history
  • Loading branch information
rhugonnet committed Mar 13, 2024
2 parents 4b54a5a + 242cbd3 commit 95122c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
22 changes: 8 additions & 14 deletions .github/scripts/generate_pip_deps_from_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@

EXCLUDE = {"python"}
REMAP_VERSION = {"tzdata": "2022.1"}
RENAME = {
"pytables": "tables",
"psycopg2": "psycopg2-binary",
"dask-core": "dask",
"seaborn-base": "seaborn",
"sqlalchemy": "SQLAlchemy",
}
RENAME = {}


def conda_package_to_pip(package: str):
Expand Down Expand Up @@ -115,13 +109,13 @@ def generate_pip_from_conda(conda_path: pathlib.Path, pip_path: pathlib.Path, co
)
pip_content = header + "\n".join(pip_deps) + "\n"

# add setuptools to requirements-dev.txt
with open(pathlib.Path(conda_path.parent, "pyproject.toml"), "rb") as fd:
meta = tomllib.load(fd)
for requirement in meta["build-system"]["requires"]:
if "setuptools" in requirement:
pip_content += requirement
pip_content += "\n"
# Add setuptools to requirements-dev.txt
# with open(pathlib.Path(conda_path.parent, "pyproject.toml"), "rb") as fd:
# meta = tomllib.load(fd)
# for requirement in meta["build-system"]["requires"]:
# if "setuptools" in requirement:
# pip_content += requirement
# pip_content += "\n"

if compare:
with pip_path.open() as file:
Expand Down
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@ scikit-image==0.*
scikit-gstat>=1.0
geoutils==0.1.*
pip
setuptools>=64
setuptools_scm[toml]>=8

0 comments on commit 95122c2

Please sign in to comment.