Compare commits

..

No commits in common. "3ae695ee0b6963a032b954ac73667ef304162534" and "235494e3d17a9df81ea3cc392db514b5e9913877" have entirely different histories.

2 changed files with 3 additions and 4 deletions

View file

@ -228,7 +228,7 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions
venv.pip_upgrade("pip")?; venv.pip_upgrade("pip")?;
venv.pip_install( venv.pip_install(
format!( format!(
"ckan[requirements]@git+https://github.com/ckan/ckan.git@ckan-{}", "git+https://github.com/ckan/ckan.git@ckan-{}#egg=ckan[requirements]",
config.ckan_version config.ckan_version
) )
.as_str(), .as_str(),
@ -241,7 +241,6 @@ rm -rf README ckan-compose ahoy dpp_default_config.ini get-docker.sh permissions
) )
.run()?; .run()?;
sh.change_dir("/usr/lib/ckan/default/src/ckan"); sh.change_dir("/usr/lib/ckan/default/src/ckan");
venv.pip_install("setuptools==81.0.0")?;
cmd!(sh, "ckan generate config /etc/ckan/default/ckan.ini").run()?; cmd!(sh, "ckan generate config /etc/ckan/default/ckan.ini").run()?;
cmd!( cmd!(
sh, sh,

View file

@ -205,7 +205,7 @@ pub fn step_install_ckanext_scheming_extension(
); );
cmd!( cmd!(
sh, sh,
"pip install -e ckanext-scheming@git+https://github.com/ckan/ckanext-scheming.git" "pip install -e git+https://github.com/ckan/ckanext-scheming.git#egg=ckanext-scheming"
) )
.run()?; .run()?;
let mut conf = ini::Ini::load_from_file("/etc/ckan/default/ckan.ini")?; let mut conf = ini::Ini::load_from_file("/etc/ckan/default/ckan.ini")?;
@ -245,7 +245,7 @@ pub fn step_install_datapusher_plus_extension(
sh.change_dir("/usr/lib/ckan/default/src"); sh.change_dir("/usr/lib/ckan/default/src");
cmd!( cmd!(
sh, sh,
"pip install -e datapusher-plus@git+https://github.com/dathere/datapusher-plus.git@main" "pip install -e git+https://github.com/dathere/datapusher-plus.git@main#egg=datapusher-plus"
) )
.run()?; .run()?;
sh.change_dir("/usr/lib/ckan/default/src/datapusher-plus"); sh.change_dir("/usr/lib/ckan/default/src/datapusher-plus");