Commit Graph

184 Commits

Author SHA1 Message Date
Jordan Bradford
da5a5abafa Only warn on failed install from requirements url 2025-09-28 14:18:51 -04:00
Erik Sundell
3ddc1e8d59 refactor: exctract calling traefik setup from ensure_jupyterhub_package func 2024-09-26 22:32:26 +02:00
Erik Sundell
a89021c49e Update to install miniforge 24.7.1-2 from 24.7.1-0 2024-09-26 13:32:07 +02:00
Erik Sundell
7a491e403c Merge branch 'main' into conda-channels 2024-09-04 13:16:58 +02:00
Erik Sundell
5172ceb4f9 Update base user environment to miniforge 24.7.1-0 (Python 3.12) 2024-09-04 12:10:29 +02:00
Min RK
634956c33e Update base user environment to miniforge 24.5.0-0 (Python 3.12)
mambaforge is deprecated, mamba has been in miniforge for some time now
2024-08-27 10:54:07 +02:00
Erik Sundell
4e397bc687 Re-install conda/mamba for every tljh upgrade (doesn't imply upgrade) 2024-02-26 16:44:12 +01:00
YuviPanda
291c096a17 Fix argument name of channels 2023-09-29 14:47:53 -07:00
pre-commit-ci[bot]
9bde7e4680 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-29 21:35:50 +00:00
YuviPanda
6359bf498c Merge remote-tracking branch 'upstream/main' into conda-channels 2023-09-29 14:27:25 -07:00
Min RK
39b1e1a7c7 preserve version pin when reinstalling conda
avoids upgrade on older versions
2023-06-09 15:33:36 +02:00
Min RK
ee23e041de reinstall conda/mamba in a separate, unconditional step
makes it more likely that subsequent conda installs will succeed

- fix indentation on the upgrade steps so they aren't run every iteration
- no longer need to bump required versions
2023-06-09 15:00:00 +02:00
Min RK
4cc55df2a4 force upgrade of conda itself
if conda upgrade conda is broken, we are in trouble

this is required to avoid the RemoveError
2023-06-09 14:08:03 +02:00
Min RK
4f0179a84c bump minimum conda/mamba versions
an old conda bug causes RemoveError: requests is a dependency of conda
when installing other packages

upgrading conda itself avoids this bug.
It's unclear what the true minimum version is to fix this,
but the important thing is that it will be upgraded if it's still the version in 0.2.0 (4.10),
so pick the version from today which we know works
2023-06-09 13:58:32 +02:00
Erik Sundell
b1c7e53be4 test refactor: try decouple admin tests from other tests 2023-06-09 03:37:39 +02:00
Erik Sundell
d4c6da52e1 maint: let installer ensure /etc/sudoers.d directory exists 2023-06-08 23:11:58 +02:00
Erik Sundell
21312b2cfd user env: upgrade jh based on hub spec 2023-05-18 23:56:46 +02:00
Erik Sundell
6388d390e1 refactor: improve readability of a section 2023-05-18 23:51:41 +02:00
Erik Sundell
9c83e9000e user env: ensure pip>=23.1.2 on install 2023-05-18 23:51:41 +02:00
Erik Sundell
eaa16babb5 hub env: use req. file and add lower bounds for readability 2023-05-18 23:51:41 +02:00
Erik Sundell
a86e4ce153 user env: only upgrade jupyterhub in user env when upgrading tljh 2023-05-18 23:51:29 +02:00
pre-commit-ci[bot]
e95942d61b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-15 08:51:36 +00:00
Erik Sundell
b3365fbe45 update: jupyterhub 4 2023-05-11 23:19:27 +02:00
Min RK
000e4f2540 sync with main 2023-04-17 09:44:58 +02:00
Erik Sundell
6883316c36 Update mambaforge from 22.11.1-4 to 23.1.0-1 2023-04-15 11:06:29 +02:00
Min RK
b5a6b3f590 Avoid downgrading user-env conda/mamba
- Only check lower bound on conda/mamba, upgrade unbounded if not matched (let conda apply upper bound according to existing pins, such as Python)
- handle missing mamba
- avoid upgrading Python by aborting the install, instead of keeping old envs
- minimum supported Python for user env is 3.9
- Fix output reporting of conda install step (no need for json capture when we don't parse the output - exit codes will do)
2023-03-27 13:20:22 +02:00
Min RK
4d42f24e48 test ensure_user_environment
verify behavior for:

- current version (no change)
- old, supported version (upgrade, but not too far)
- too old, re-run installer
- directory exists, no conda
2023-03-23 12:34:44 +01:00
Min RK
594b61003f add some logging to conda setup 2023-03-23 12:31:50 +01:00
Min RK
6d0c1cbf63 Remove very old conda versions from installer.py
- 4.7.10 was Python 3.7 (no longer supported)
- 4.5.4 was Python 3.6
2023-03-21 15:59:37 +01:00
Min RK
1a3c48a500 Update base user environment to mambaforge 22.11.1-4
shift some duplicated code into utility functions and constants
2023-03-21 14:37:50 +01:00
Min RK
de1fc86b5e only pin major versions in requirements-base.txt, installer.py 2023-03-21 10:30:59 +01:00
YuviPanda
12316c3256 Upgrade some packages
Should upgrade base python version separately
2023-03-21 09:27:56 +01:00
Pris Nasrat
a7774e55de Ensure SQLAlchemy 1.x used for hub
Fixes #846
2023-01-30 11:17:37 -05:00
Will Dampier
8d1033393c adding tljh_extra_user_conda_channels hook to the hooks and installer 2022-09-02 14:46:55 -04:00
Simon Li
65336e21ee pre-commit run -a 2022-06-17 17:36:42 +01:00
YuviPanda
8540451cd8 Bump systemdspawner version
https://github.com/jupyterhub/systemdspawner/pull/94 just made
a release
2022-04-22 01:30:24 -07:00
Ray Bell
2f33f9893a ENH: add logging if user-requirements-txt-url found 2022-01-24 21:50:51 -05:00
Erik Sundell
e0aaa4f995 pre-commit: run black with string normalization 2021-11-03 23:55:34 +01:00
Erik Sundell
771ae59636 pre-commit: run black without string normalization 2021-11-03 23:53:41 +01:00
Connor Dibble
a91571dd22 Support Arm64 CPU architectures 2021-11-03 23:06:37 +01:00
Erik Sundell
c2c4d708f5 pyupgrade fixes 2021-10-31 11:26:40 +01:00
Erik Sundell
a64f242b61 flake8 fixes: unused imports and f-strings without vars 2021-10-28 15:43:50 +02:00
Erik Sundell
2d10400f89 Update firstuseauthenticator to 1.0.0 2021-10-28 13:39:14 +02:00
Erik Sundell
125e12ca5e Let pip upgrade packages
Since we now longer pin versions to the patch version, we should make
an install cause the packages upgrade within the version constraints
rathern than just settle for the current version if it is already
installed.
2021-10-27 10:41:43 +02:00
Erik Sundell
6197784045 Try stop pinning chardet 2021-10-27 09:15:44 +02:00
Erik Sundell
990135e179 hub env: bump to require latest major version, less pinned now 2021-10-27 09:15:44 +02:00
Simon Li
80b347349a Update to mambaforge_version 4.10.3-7 2021-10-18 22:51:12 +01:00
Simon Li
b3c07ba265 miniforge FIXME was fixed!
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2021-10-18 22:09:42 +01:00
Simon Li
d869540a6c ensure mamba installed, add old miniconda check back 2021-10-18 19:41:50 +01:00
Simon Li
0018beca4f Switch to mambaforge 2021-10-18 19:41:50 +01:00