diff --git a/activitysim/cli/create.py b/activitysim/cli/create.py index ec545d3787..7cd8d218c5 100644 --- a/activitysim/cli/create.py +++ b/activitysim/cli/create.py @@ -123,7 +123,7 @@ def get_example( Files downloaded via http pointers will be cached in this location. If a path is not given but just a truthy value, then a cache directory is created using in a location - selected by the appdirs library (or, if not installed, + selected by the platformdirs library (or, if not installed, linking is skipped.) """ if example_name not in EXAMPLES: @@ -200,11 +200,11 @@ def download_asset(url, target_path, sha256=None, link=True): if link: if not isinstance(link, (str, Path)): try: - import appdirs + import platformdirs except ImportError: link = False else: - link = appdirs.user_data_dir("ActivitySim") + link = platformdirs.user_data_dir("ActivitySim") original_target_path = target_path target_path = os.path.join(link, target_path) os.makedirs(os.path.dirname(target_path), exist_ok=True) diff --git a/conda-environments/activitysim-dev-base.yml b/conda-environments/activitysim-dev-base.yml index f0bdcb3a36..1e63b621db 100644 --- a/conda-environments/activitysim-dev-base.yml +++ b/conda-environments/activitysim-dev-base.yml @@ -19,8 +19,8 @@ dependencies: - black >= 22.0,<23 - bump2version # for making a release - coveralls -- cytoolz >= 0.8.1 -- dask +- cytoolz = 0.12.* +- dask = 2023.3.* - descartes - filelock - fsspec @@ -30,44 +30,45 @@ dependencies: - ipykernel # so this env will appear in jupyter as a selection - isort - jupyterlab -- larch >= 5.5.8 +- larch = 5.7.* - matplotlib - myst-parser # allows markdown in sphinx - nbconvert - nbformat -- numba >= 0.55.2 +- numba = 0.56.* - numexpr -- numpy >= 1.16.1,<=1.21 +- numpy = 1.23.* - numpydoc -- openmatrix >= 0.3.4.1 -- orca >= 1.6 -- pandas >= 1.1.0 +- openmatrix = 0.3.* +- orca = 1.8 +- pandas = 1.4.* +- platformdirs = 3.2.* - pre-commit -- psutil >= 4.1 -- pyarrow >= 2.0 +- psutil = 5.9.* +- pyarrow = 11.* - pycodestyle -- pydantic +- pydantic = 1.10.* - pydata-sphinx-theme -- pyinstrument -- pypyr +- pyinstrument = 4.4 +- pypyr = 5.8.* - pytables >=3.5.1,<3.7 -- pytest +- pytest = 7.2.* - pytest-cov - pytest-regressions -- pyyaml >= 5.1 -- requests >= 2.7 -- rich +- pyyaml = 6.* +- requests = 2.28.* +- rich = 13.3.* - ruby # required for benchmarking pre-commit hooks - setuptools_scm -- scikit-learn >= 1.1 +- scikit-learn = 1.2.* - simwrapper > 1.7 - snakeviz # for profiling -- sphinx -- sphinx_rtd_theme -- sphinx-argparse -- xarray >= 0.21 +- sphinx = 6.1.* +- sphinx_rtd_theme = 1.2.* +- sphinx-argparse = 0.4.* +- xarray = 2023.2.* - xmle -- zarr +- zarr = 2.14.* - pip: - autodoc_pydantic diff --git a/conda-environments/activitysim-dev.yml b/conda-environments/activitysim-dev.yml index c46b436dea..cac073df65 100644 --- a/conda-environments/activitysim-dev.yml +++ b/conda-environments/activitysim-dev.yml @@ -15,8 +15,8 @@ dependencies: - black >= 22.0,<23 - bump2version # for making a release - coveralls -- cytoolz >= 0.8.1 -- dask +- cytoolz = 0.12.* +- dask = 2023.3.* - descartes - filelock - fsspec @@ -26,46 +26,46 @@ dependencies: - ipykernel # so this env will appear in jupyter as a selection - isort - jupyterlab -- larch >= 5.5.8 +- larch = 5.7.* - matplotlib - myst-parser # allows markdown in sphinx - nbconvert - nbformat -- numba >= 0.56.4 +- numba = 0.56.* - numexpr -- numpy >= 1.16.1 +- numpy = 1.23.* - numpydoc -- openmatrix >= 0.3.4.1 -- orca >= 1.6 -- pandas >= 1.1.0 +- openmatrix = 0.3.* +- orca = 1.8 +- pandas = 1.4.* +- platformdirs = 3.2.* - pre-commit -- psutil >= 4.1 -- pyarrow >= 2.0 +- psutil = 5.9.* +- pyarrow = 11.* - pycodestyle -- pydantic +- pydantic = 1.10.* - pydata-sphinx-theme -- pyinstrument -- pypyr +- pyinstrument = 4.4 +- pypyr = 5.8.* - pytables >=3.5.1,<3.7 -- pytest +- pytest = 7.2.* - pytest-cov - pytest-regressions -- pyyaml >= 5.1 -- requests >= 2.7 -- rich +- pyyaml = 6.* +- requests = 2.28.* +- rich = 13.3.* - ruby # required for benchmarking pre-commit hooks - setuptools_scm -- scikit-learn >= 1.1 +- scikit-learn = 1.2.* - sharrow >= 2.5.2 - simwrapper > 1.7 -- scikit-learn >= 1.1.1 - snakeviz # for profiling -- sphinx -- sphinx_rtd_theme -- sphinx-argparse -- xarray >= 0.21 +- sphinx = 6.1.* +- sphinx_rtd_theme = 1.2.* +- sphinx-argparse = 0.4.* +- xarray = 2023.2.* - xmle -- zarr +- zarr = 2.14.* - pip: - autodoc_pydantic diff --git a/conda-environments/github-actions-tests.yml b/conda-environments/github-actions-tests.yml index 63d353ea51..28d6c51f8e 100644 --- a/conda-environments/github-actions-tests.yml +++ b/conda-environments/github-actions-tests.yml @@ -9,26 +9,27 @@ dependencies: - pip - black >= 22.0,<23 - coveralls -- cytoolz >= 0.8.1 +- cytoolz = 0.12.* +- dask = 2023.3.* - isort - nbmake -- numba >= 0.56.4 -- numpy >= 1.16.1 -- openmatrix >= 0.3.4.1 -- orca >= 1.6 -- pandas >= 1.1.0 -- psutil >= 4.1 -- pyarrow >= 2.0 -- pypyr >= 5.3 +- numba = 0.56.* +- numpy = 1.23.* +- openmatrix = 0.3.* +- orca = 1.8 +- pandas = 1.4.* +- platformdirs = 3.2.* +- psutil = 5.9.* +- pyarrow = 11.* +- pypyr = 5.8.* - pytables >= 3.5.1,<3.7 # orca's constraint -- pytest +- pytest = 7.2.* - pytest-cov - pytest-regressions -- pyyaml >= 5.1 -- requests >= 2.7 -- scikit-learn >= 1.1 +- pyyaml = 6.* +- requests = 2.28.* +- scikit-learn = 1.2.* - sharrow >= 2.5.2 - simwrapper > 1.7 -- scikit-learn >= 1.1.1 -- xarray >= 0.21 -- zarr +- xarray = 2023.2.* +- zarr = 2.14.* diff --git a/setup.cfg b/setup.cfg index cb3b413880..b2736a99a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ install_requires = numpy >= 1.16.1 openmatrix >= 0.3.4.1 orca >= 1.6 - pandas >= 1.1.0 + pandas >= 1.4, <2 psutil >= 4.1 pyarrow >= 2.0 pypyr >= 5.3