Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to grayskull update #39

Merged
merged 10 commits into from
Oct 3, 2023
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
9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 1 addition & 14 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
provider:
win: azure
bot:
automerge: true
conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
conda_build:
pkg_format: '2'
error_overlinking: true
conda_forge_output_validation: true
bot:
automerge: true
inspection: update-grayskull
46 changes: 46 additions & 0 deletions recipe/cmd.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From f7aa3551b305e1706c985953d93c5320c81c616b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= <[email protected]>
Date: Tue, 3 Oct 2023 23:51:15 +0200
Subject: [PATCH] fix command line

---
pysqa/__main__.py | 2 +-
pysqa/cmd.py | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pysqa/__main__.py b/pysqa/__main__.py
index 46d86a4..1f0e4eb 100644
--- a/pysqa/__main__.py
+++ b/pysqa/__main__.py
@@ -3,4 +3,4 @@
from pysqa.cmd import command_line

if __name__ == "__main__":
- command_line(sys.argv[1:])
+ command_line(arguments_lst=sys.argv[1:])
diff --git a/pysqa/cmd.py b/pysqa/cmd.py
index 8c0bea3..747bb8e 100644
--- a/pysqa/cmd.py
+++ b/pysqa/cmd.py
@@ -7,7 +7,7 @@
from pysqa.utils.execute import execute_command


-def command_line(argv, execute_command=execute_command):
+def command_line(arguments_lst=None, execute_command=execute_command):
"""
Parse the command line arguments.

@@ -25,9 +25,11 @@ def command_line(argv, execute_command=execute_command):
run_time_max = None
command = None
job_id = None
+ if arguments_lst is None:
+ arguments_lst = sys.argv[1:]
try:
opts, args = getopt.getopt(
- argv,
+ arguments_lst,
"f:pq:j:w:n:m:t:b:c:ri:dslh",
[
"config_directory=",
41 changes: 17 additions & 24 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,45 @@ package:
version: {{ version }}

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/pysqa-{{ version }}.tar.gz
sha256: fa7316174f00ceb6a29167e157cefca1e6d443170db58760fdfec891a0136d78
patches:
- pympipool.patch
- versioneer.patch
- cmd.patch

build:
entry_points:
- pysqa=pysqa.cmd:command_line
- pysqa-executor=pysqa.executor.backend:command_line
noarch: python
number: 0
script: {{ PYTHON }} -m pip install . --no-deps -vv
script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation
number: 1

requirements:
host:
- python >=2.7
- python >=3.6
- pip
run:
- python >=2.7
- pip
- defusedxml >=0.7.1
- python >=3.6
- jinja2 >=3.1.2
- pandas >=2.1.0
- pyyaml >=6.0.1
- jinja2 >=3.1.2
- paramiko >=3.3.1
- tqdm >=4.66.1
- pympipool >=0.7.0
- cloudpickle >=2.2.1

test:
imports:
- pysqa
commands:
- pip check
- pysqa --help
requires:
- pip

about:
home: https://github.com/pyiron/pysqa
summary: pysqa - simple queue adapter
license: BSD-3-Clause
license_family: BSD
license_file: LICENSE
summary: Simple queue adapter for Python
description: |
The goal of pysqa is to make submitting to an HPC cluster as easy as starting another subprocess.
This is based on the assumption that even though modern queuing systems allow for an wide range of
different configuration, most users submit the majority of their jobs with very similar parameters.
Therefore pysqa allows the users to store their submission scripts as jinja2 templates for quick
access. After the submission pysqa allows the users to track the progress of their jobs, delete them
or enable reservations using the built-in functionality of the queuing system. The currently supported
queuing systems are: LFS, MOAB, SGE, SLURM, TORQUE.
doc_url: https://github.com/pyiron/pysqa
dev_url: https://github.com/pyiron/pysqa

extra:
recipe-maintainers:
Expand Down
28 changes: 28 additions & 0 deletions recipe/pympipool.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From c6c9d0a734b0a404404b6764c731e95df327e4dc Mon Sep 17 00:00:00 2001
From: Jan Janssen <[email protected]>
Date: Tue, 3 Oct 2023 23:09:02 +0200
Subject: [PATCH] Fix pympipool import

---
pysqa/executor/__init__.py | 1 +
pysqa/__init__.py | 1 -
2 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pysqa/executor/__init__.py b/pysqa/executor/__init__.py
index e69de29..0209218 100644
--- a/pysqa/executor/__init__.py
+++ b/pysqa/executor/__init__.py
@@ -0,0 +1 @@
+from pysqa.executor.executor import Executor
diff --git a/pysqa/__init__.py b/pysqa/__init__.py
index 456047e..d8a3f3d 100644
--- a/pysqa/__init__.py
+++ b/pysqa/__init__.py
@@ -2,7 +2,6 @@
__all__ = []

from pysqa.queueadapter import QueueAdapter
-from pysqa.executor.executor import Executor

from ._version import get_versions

Loading