Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- click
- pytest
- setuptools
- plotly
- boto3
- botocore
- tqdm
Expand Down
76 changes: 27 additions & 49 deletions pridepy/aspera/key/aspera_tokenauth_id_rsa
Original file line number Diff line number Diff line change
@@ -1,49 +1,27 @@
-----BEGIN OPENSSH PRIVATE KEY-----
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
VrDBOxh0ODDRAAAAAAEC
-----END OPENSSH PRIVATE KEY-----
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEA3k3TTTgZ9R9HezmJ3Q5RBdy5cJpS4jF6ULUMA228KVCa++CM
9O4b0J8QoaZBnMX4jcIRB4kd9e+PwJjUcDwHGpL+41YSl46Vnic7gOuRxLDo2nwm
8YU+zJ0Qlz0faO7AlzfyGAwSinsapCg07pnfvbQwmACLFLs3MOiKZrUZzGufTw9P
MVkClxxMUANjzdgIqvOFEENcCYtNyt1uGCvo5A1gIKiRJWtuk8WKea9zvF5EAmIw
YnEmbUELtWsnMoHDERmcsrGPlSwNxWpPQYeluy2InlNQgZyMNduAqevJDQwf2SXZ
7kzxQ/HmHzVRKWSVmE9ZQ5vzGrnOWghVdSffwQIDAQABAoIBAA7Nv3O9t+rNI7E2
xnHAVZBun7G6MSlLcrIDsHJdASH+MmfyDujzn0oQAadGH0ntnAzynrgx/xsE0j2Y
39K+iJmSLuOcNH4/ukJvKeT+qvUec88y49QDE8jD79omcZxHA+++A8LqsORkaMSE
QewetpnXMUI6DQj7I6R/49GNn1NvuoN3mx7ID9wBOGHtvTRPgYSASXOsCaqCq7eq
mzdYD1Hg45ozZHOXVQBXbJ6cRx7EDyI2ggyQTj4C2EqHRHhViTI/U3JwGXl5skFr
M26TyUyT+i+stHwUjgkiK05nD/cWLgaE/untGHkkzSCRehxaUiYCHmWIoFlyxMMm
lbcW2g0CgYEA82JG1y01A4Sut/jmVseAI99juU2aoSH7xsvuPBYga19YIHW5hkbH
Kw9wYgHKeu+qhDY/ZZBSib3CXn+TU5rSe6rfffkOF8ATXLXCgvlJsVwEYHVhFNe7
wuUkpVqKAU3Ai6QNxE45cozUxXicZttfqDoKAUoutJuyUkAQaOvEMCUCgYEA6dPR
IWYiK3FzM94nFpzN9DFNMSslH/DaWPGhFXk8vTXb3JpgsumQl9QGQ8lVPsbL5J5y
heSXQSUok+CYI2Qup2RRv3pMpORwtbA8RWzCPI8RiAc5WNgVe/LOB8EZWEmacEg3
KaWl7U074MPGFh4v8/3z5up7boD1QkxdcLLT4G0CgYEAwx36pO79HUD1wU+tecye
kiO5Ewl/+cYAzzMWXt1uSCY7xGocveVoLsFF24yMA1q4XR4QXSACy6JxfMjSF6h7
LeGjIp7UCX5XB3A/7DhmN+YJLDtuBQOe53REmLuo/7qRrmFrGAGOVKNKwLUczej5
GyjMdJRANVLM9tudTEAXHHECgYB8FGvAdmshdIV2e6dwZ2se7t6Qfd2ocm3bjvU0
6O3jVeZCzSUNK8YP23IrnHYA5wshWTdad7AP4MEEn8T72tiq+SAsJKDxS0vIDiod
iRYVfrIF5hd3Xssfx/uuv7hMUlqCxL+I+R7wqvBgWGMQL5qwtg0sdzdir0n2kYFw
IWUvjQKBgQCweTjm1yJ+lBwTW0akOZktSkO2TQaT0pISvcD6z1iBjLrCKiFBxPrw
I6tTCNC8DaT+7XKq4wHoulRANBURwEj3Eo0Bv/3C81pfoJGlRQc8+2PQRnuJdU+l
Vb5et4rzOM5BMM//TPjdHTq8A78+NghKVdPrzTgbgIUjHDKVyz8Usg==
-----END RSA PRIVATE KEY-----
2 changes: 1 addition & 1 deletion pridepy/files/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def download_files_from_aspera(
"""
ascp_path = Files.get_ascp_binary()
key_full_path = importlib.resources.files("pridepy").joinpath(
"aspera/key/aspera_tokenauth_id_rsa"
"aspera/key/asperaweb_id_dsa.openssh"
)
key_path = os.path.abspath(key_full_path)
for file in file_list_json:
Expand Down
Empty file removed pridepy/statistics/__init__.py
Empty file.
48 changes: 0 additions & 48 deletions pridepy/statistics/statistics.py

This file was deleted.

3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pridepy"
version = "0.0.10"
version = "0.0.12"
description = "Python Client library for PRIDE Rest API"
authors = [
"PRIDE Team <pride-support@ebi.ac.uk>",
Expand Down Expand Up @@ -48,7 +48,6 @@ python = "^3.9"
requests = "^2.31.0"
ratelimit = "^2.2.1"
click = "^8.1.7"
plotly = "^5.18.0"
tqdm = "^4.66.1"
boto3 = "^1.34.0"
botocore = "^1.34.0"
Expand Down
3 changes: 1 addition & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# recipe/meta.yaml
package:
name: pridepy
version: "0.0.8"
version: "0.0.12"

source:
path: ../
Expand All @@ -26,7 +26,6 @@ requirements:
- click~=8.1.7
- pytest~=8.0.2
- setuptools
- plotly~=5.22.0
- boto3~=1.34.61
- botocore~=1.34.74
- tqdm
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ratelimit
click
pytest
setuptools
plotly
boto3
botocore
tqdm
Expand Down
Loading