Merge pull request #145 from datalad/nofork

Remove osfclient fork
datalad · Feb 10, 2021 · acada8c · acada8c
2 parents 3c2f14c + cbaaf86
commit acada8c
Show file tree

Hide file tree

Showing 64 changed files with 16 additions and 5,756 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.2.2 (Feb 10, 2021) -- No forks
+
+- The internal fork of osfclient has been removed and a dependency to
+  version 0.0.5 (which comes with all necessary features) was added.
+
+
 0.2.1 (Feb 1, 2021) -- Bugfix
 
 - Fixes

diff --git a/datalad_osf/annex_remote.py b/datalad_osf/annex_remote.py
@@ -18,8 +18,8 @@
 import posixpath # OSF uses posix paths!
 from urllib.parse import urlparse
 
-from datalad_osf.osfclient.osfclient import OSF
-from datalad_osf.osfclient.osfclient.exceptions import UnauthorizedException
+from osfclient import OSF
+from osfclient.exceptions import UnauthorizedException
 
 from annexremote import (
     Master,

diff --git a/datalad_osf/create_sibling_osf.py b/datalad_osf/create_sibling_osf.py
@@ -30,7 +30,7 @@
     EnsureBool,
 )
 from datalad.interface.results import get_status_dict
-from datalad_osf.osfclient.osfclient import OSF
+from osfclient import OSF
 from datalad_osf.utils import (
     create_node,
     update_node,

diff --git a/datalad_osf/credentials.py b/datalad_osf/credentials.py
@@ -28,8 +28,8 @@
     Token,
     UserPassword,
 )
-from datalad_osf.osfclient.osfclient import OSF
-from datalad_osf.osfclient.osfclient.exceptions import UnauthorizedException
+from osfclient import OSF
+from osfclient.exceptions import UnauthorizedException
 
 
 @build_doc

diff --git a/datalad_osf/git_remote.py b/datalad_osf/git_remote.py
@@ -25,7 +25,7 @@
 from unittest.mock import patch
 import posixpath
 
-from datalad_osf.osfclient.osfclient import OSF
+from osfclient import OSF
 
 
 class OSFGitRemote(object):

diff --git a/datalad_osf/osfclient/.coveragerc b/datalad_osf/osfclient/.coveragerc
diff --git a/datalad_osf/osfclient/.gitignore b/datalad_osf/osfclient/.gitignore
diff --git a/datalad_osf/osfclient/.travis.yml b/datalad_osf/osfclient/.travis.yml
diff --git a/datalad_osf/osfclient/CHANGELOG b/datalad_osf/osfclient/CHANGELOG
diff --git a/datalad_osf/osfclient/CONDUCT.md b/datalad_osf/osfclient/CONDUCT.md
diff --git a/datalad_osf/osfclient/CONTRIBUTING.md b/datalad_osf/osfclient/CONTRIBUTING.md
diff --git a/datalad_osf/osfclient/LICENSE b/datalad_osf/osfclient/LICENSE
diff --git a/datalad_osf/osfclient/LOGO/osf-cli-logo-v1-small.png b/datalad_osf/osfclient/LOGO/osf-cli-logo-v1-small.png
diff --git a/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.ai b/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.ai
diff --git a/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.png b/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.png
diff --git a/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.svg b/datalad_osf/osfclient/LOGO/osf-cli-logo-v1.svg
diff --git a/datalad_osf/osfclient/MANIFEST.in b/datalad_osf/osfclient/MANIFEST.in