Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2020-03-09 13:54:33 -04:00
commit 6dbde41709
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 80 additions and 0 deletions

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="scinu"
avatar="http://cdn.libravatar.org/avatar/c5a190c5c0ce61a5be141609dff37fe1"
subject="Problem solved (partially)"
date="2020-03-09T17:00:52Z"
content="""
If I \"git rm\" the files causing problems, the upgrade to V8 runs through.
So, I'm not sure what's causing the problem, but at least I can work again.
Best, Scinu
"""]]

View file

@ -0,0 +1,68 @@
[[!comment format=mdwn
username="sam.nastase@2b4a9b3e5094dab41e0a4de0b808a2697a3e9860"
nickname="sam.nastase"
avatar="http://cdn.libravatar.org/avatar/55c74b521bcb7322069f35bf655f81e0"
subject="comment 7"
date="2020-03-09T17:31:44Z"
content="""
I conda uninstalled datalad in this conda env, then pip installed from master using `pip install git+https://github.com/datalad/datalad.git`
Output of conda list:
# packages in environment at /usr/people/snastase/.conda/envs/datalad:
#
# Name Version Build Channel
_libgcc_mutex 0.1 main
appdirs 1.4.3 pypi_0 pypi
boto 2.49.0 pypi_0 pypi
ca-certificates 2020.1.1 0
certifi 2019.11.28 py37_0
cffi 1.14.0 pypi_0 pypi
chardet 3.0.4 pypi_0 pypi
cryptography 2.8 pypi_0 pypi
datalad 0.12.2 pypi_0 pypi
deprecated 1.2.7 pypi_0 pypi
fasteners 0.15 pypi_0 pypi
gitdb 4.0.2 pypi_0 pypi
gitpython 3.1.0 pypi_0 pypi
humanize 2.0.0 pypi_0 pypi
idna 2.9 pypi_0 pypi
importlib-metadata 1.5.0 pypi_0 pypi
iso8601 0.1.12 pypi_0 pypi
jeepney 0.4.3 pypi_0 pypi
jsmin 2.2.2 pypi_0 pypi
keyring 21.1.1 pypi_0 pypi
keyrings-alt 3.4.0 pypi_0 pypi
ld_impl_linux-64 2.33.1 h53a641e_7
libedit 3.1.20181209 hc058e9b_0
libffi 3.2.1 hd88cf55_4
libgcc-ng 9.1.0 hdf63c60_0
libstdcxx-ng 9.1.0 hdf63c60_0
monotonic 1.5 pypi_0 pypi
msgpack 1.0.0 pypi_0 pypi
ncurses 6.2 he6710b0_0
openssl 1.1.1d h7b6447c_4
patool 1.12 pypi_0 pypi
pip 20.0.2 py37_1
pycparser 2.20 pypi_0 pypi
pygithub 1.46 pypi_0 pypi
pyjwt 1.7.1 pypi_0 pypi
python 3.7.6 h0371630_2
readline 7.0 h7b6447c_5
requests 2.23.0 pypi_0 pypi
secretstorage 3.1.2 pypi_0 pypi
setuptools 45.2.0 py37_0
simplejson 3.17.0 pypi_0 pypi
six 1.14.0 pypi_0 pypi
smmap 3.0.1 pypi_0 pypi
sqlite 3.31.1 h7b6447c_0
tk 8.6.8 hbc83047_0
tqdm 4.43.0 pypi_0 pypi
urllib3 1.25.8 pypi_0 pypi
wheel 0.34.2 py37_0
whoosh 2.7.4 pypi_0 pypi
wrapt 1.12.0 pypi_0 pypi
xz 5.2.4 h14c3975_4
zipp 3.1.0 pypi_0 pypi
zlib 1.2.11 h7b6447c_3
"""]]