From 677460107afd443d9f641be1a699948b5b685595 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 14 May 2020 14:50:35 +0200 Subject: [PATCH 1/3] Create working directory if it does not exist --- pysqa/basic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pysqa/basic.py b/pysqa/basic.py index 5da159be..ca9f93c9 100644 --- a/pysqa/basic.py +++ b/pysqa/basic.py @@ -327,6 +327,8 @@ def _write_queue_script( run_time_max=run_time_max, command=command, ) + if not os.path.exists(working_directory): + os.makedirs(working_directory) queue_script_path = os.path.join(working_directory, "run_queue.sh") with open(queue_script_path, "w") as f: f.writelines(queue_script) From 57eb43496abef382eb118c321a0243316cb21f76 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 14 May 2020 15:13:08 +0200 Subject: [PATCH 2/3] Switch from Python 2.7 to 3.8 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b96e944..9dcecb06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ matrix: include: - stage: test - name: test_linux_2_7 + name: test_linux_3_8 os: linux language: python - env: MINICONDA="https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh" PYTHONVER="2.7" + env: MINICONDA="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh" PYTHONVER="3.8" install: - export PATH="$HOME/miniconda/bin:$PATH" - wget ${MINICONDA} -O miniconda.sh @@ -52,10 +52,10 @@ matrix: on: tags: true - - name: test_osx_2_7 + - name: test_osx_3_8 os: osx language: generic - env: MINICONDA="https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh" PYTHONVER="2.7" + env: MINICONDA="https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" PYTHONVER="3.8" install: - export PATH="$HOME/miniconda/bin:$PATH" - wget ${MINICONDA} -O miniconda.sh From fd7e6d46a14aad4702b557038fd4f51549e3a483 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 14 May 2020 15:17:26 +0200 Subject: [PATCH 3/3] Allow higher versions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9dcecb06..74c9c4b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: - conda info -a - conda config --set always_yes yes --set changeps1 no - conda update -q conda - - conda install -y -c conda-forge python=${PYTHONVER} coverage defusedxml=0.5.0 pandas=0.24.2 pyyaml=5.1.2 jinja2=2.10.1 paramiko=2.4.2 tqdm=4.35.0 + - conda install -y -c conda-forge python=${PYTHONVER} coverage "defusedxml>=0.5.0" "pandas>=0.24.2" "pyyaml>=5.1.2" "jinja2>=2.10.1" "paramiko>=2.4.2" "tqdm>=4.35.0" - pip install --pre . script: - coverage run -m unittest discover tests @@ -63,7 +63,7 @@ matrix: - conda info -a - conda config --set always_yes yes --set changeps1 no - conda update -q conda - - conda install -y -c conda-forge python=${PYTHONVER} coverage defusedxml=0.5.0 pandas=0.24.2 pyyaml=5.1.2 jinja2=2.10.1 paramiko=2.4.2 tqdm=4.35.0 + - conda install -y -c conda-forge python=${PYTHONVER} coverage "defusedxml>=0.5.0" "pandas>=0.24.2" "pyyaml>=5.1.2" "jinja2>=2.10.1" "paramiko>=2.4.2" "tqdm>=4.35.0" - pip install --pre . script: - coverage run -m unittest discover tests