From 9727a98921a722501895305fdb74c15c84b51bba Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 10:12:49 +0200 Subject: [PATCH 1/7] fix deprecated function --- ena_upload/templates/ENA_template_runs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ena_upload/templates/ENA_template_runs.xml b/ena_upload/templates/ENA_template_runs.xml index d4a35ea..4c6d2f6 100755 --- a/ena_upload/templates/ENA_template_runs.xml +++ b/ena_upload/templates/ENA_template_runs.xml @@ -11,7 +11,7 @@ def attributetest(row, column): xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ftp://ftp.sra.ebi.ac.uk/meta/xsd/sra_1_6/SRA.run.xsd"> - + From 5238c70f14e8048e51f40b18b819e1e740a2c369 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 10:12:55 +0200 Subject: [PATCH 2/7] lock versions --- .gitignore | 3 +++ requirements.txt | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 229114a..7e6c35e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .vscode/launch.json .secret.yml +build/ +ena_upload_cli.egg-info/ +ena_upload/__pycache__/ diff --git a/requirements.txt b/requirements.txt index 25ba192..fbfa238 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -genshi -lxml +genshi==0.7.7 +lxml==4.9.3 pandas>=1.2 -pyyaml -requests -openpyxl +pyyaml==5.1 +requests==2.31.0 +openpyxl==3.1.2 From ba2fd642e9144c582d22238332e4412407243da3 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 10:14:14 +0200 Subject: [PATCH 3/7] lock pandas --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index fbfa238..a96e561 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -genshi==0.7.7 -lxml==4.9.3 -pandas>=1.2 +genshi==0.7 +lxml==4.9 +pandas==2.0 pyyaml==5.1 -requests==2.31.0 -openpyxl==3.1.2 +requests==2.31 +openpyxl==3.1 From 225a3bc700a3e58b4554ea93316218dc7a5b6bba Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 11:37:40 +0200 Subject: [PATCH 4/7] full version --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index a96e561..1b91913 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -genshi==0.7 -lxml==4.9 -pandas==2.0 +genshi==0.7.7 +lxml==4.9.3 +pandas==2.0.3 pyyaml==5.1 -requests==2.31 -openpyxl==3.1 +requests==2.31.0 +openpyxl==3.1.2 From ef6e6dac919a5836a152d6593239af7472e2d3bc Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 13:05:50 +0200 Subject: [PATCH 5/7] update requirements --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1b91913..9a42b37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -genshi==0.7.7 -lxml==4.9.3 -pandas==2.0.3 -pyyaml==5.1 -requests==2.31.0 -openpyxl==3.1.2 +genshi==0.7.* +lxml==4.9.3, <= 5.0.0 +pandas>=2.0.3 , <= 3.0.0 +pyyaml==5.* +requests==2.31.0 , <= 3.0.0 +openpyxl==3.1.2 , <= 4.0.0 From 6034080a8c23e110845cc8ee33cae6411b3aab15 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 13:06:48 +0200 Subject: [PATCH 6/7] fix greater than sign --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9a42b37..8958e29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ genshi==0.7.* -lxml==4.9.3, <= 5.0.0 +lxml>=4.9.3, <= 5.0.0 pandas>=2.0.3 , <= 3.0.0 pyyaml==5.* -requests==2.31.0 , <= 3.0.0 -openpyxl==3.1.2 , <= 4.0.0 +requests>=2.31.0 , <= 3.0.0 +openpyxl>=3.1.2 , <= 4.0.0 From e89dcf2ac85b58d8bfba0de367b576ce8db621a7 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 29 Aug 2023 13:23:15 +0200 Subject: [PATCH 7/7] VERSION --- ena_upload/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ena_upload/_version.py b/ena_upload/_version.py index 22049ab..63af887 100644 --- a/ena_upload/_version.py +++ b/ena_upload/_version.py @@ -1 +1 @@ -__version__ = "0.6.2" +__version__ = "0.6.3"