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

Issue1373 #1374

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b20313c
tag version stable
Feb 8, 2024
4921fb1
resolving merge
petersilva Feb 14, 2024
75ce6d0
adjust for older os and python versions
Feb 8, 2024
bc04a81
tagging release version
Mar 14, 2024
e885d3e
Merge branch 'v3.00.52release' into stable
Mar 14, 2024
7231f7b
old stuff cannot use newer dependencies
Mar 14, 2024
5ec2563
modifying for unsupported old python 3.6
petersilva Feb 26, 2024
b1d6ad4
Merge branch 'development' into pre_release_py36
petersilva May 6, 2024
6bb4e5b
Merge branch 'development' into pre_release_py36
petersilva May 6, 2024
70736dc
Merge branch 'development' into pre_release_py36
petersilva May 6, 2024
c55c3cc
Merge branch 'pre_release_py36' into stable_py36
petersilva May 17, 2024
89a39e3
Merge branch 'development' into development_py36
petersilva Jun 18, 2024
1e31161
version mangling
petersilva Jun 18, 2024
bbfb82b
Merge branch 'development' into development_py36
petersilva Jun 18, 2024
d620a2f
weirdness in merge for py36
petersilva Jul 17, 2024
4f12f6d
Merge branch 'development' into development_py36
petersilva Jul 17, 2024
8eca22f
Merge branch 'development' into development_py36
petersilva Jul 17, 2024
6b444f5
Merge branch 'development' into development_py36
petersilva Aug 6, 2024
024f25d
Merge branch 'development' into development_py36
petersilva Aug 13, 2024
b100c82
Merge branch 'development' into development_py36
petersilva Sep 11, 2024
bee2f21
mark for release
petersilva Sep 11, 2024
6251e71
Merge branch 'development' into development_py36
petersilva Sep 17, 2024
5215a85
Merge branch 'development' into development_py36
petersilva Oct 8, 2024
6b2be6b
Merge branch 'development' into development_py36
petersilva Oct 25, 2024
b17b686
Merge branch 'development' into development_py36
petersilva Oct 30, 2024
365851c
Merge branch 'development' into development_py36
petersilva Oct 30, 2024
d3196e5
Merge branch 'development' into development_py36
petersilva Oct 30, 2024
b6097ca
Merge branch 'development' into development_py36
petersilva Oct 31, 2024
5feb117
Merge branch 'development' into development_py36
petersilva Dec 18, 2024
cc96e8c
Merge branch 'development' into development_py36
petersilva Dec 18, 2024
74e6e6b
Merge branch 'development' into development_py36
petersilva Dec 21, 2024
6cc71bd
Merge branch 'development' into development_py36
petersilva Jan 10, 2025
38ebfa8
Merge branch 'development' into development_py36
petersilva Jan 23, 2025
f169b69
correct path for file accellerator
petersilva Jan 24, 2025
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
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: metpx-sr3
Section: python
Priority: optional
Maintainer: Shared Services Canada Supercomputing <[email protected]>
Build-Depends: debhelper (>= 9), dh-python, python3, python3-appdirs, python3-all, python3-setuptools, python3-docutils, python3-jsonpickle, python3-humanfriendly, python3-humanize, python3-paramiko, python3-psutil, python3-watchdog, pybuild-plugin-pyproject, python3-hatchling
Build-Depends: debhelper (>= 9), dh-python, python3, python3-appdirs, python3-all, python3-setuptools, python3-docutils, python3-jsonpickle, python3-humanfriendly, python3-humanize, python3-paramiko, python3-psutil, python3-watchdog
Standards-Version: 3.9.5
X-Python3-Version: >= 3.6
Vcs-Git: https://github.com/MetPX/sarracenia
Expand Down
206 changes: 0 additions & 206 deletions pyproject.toml

This file was deleted.

2 changes: 1 addition & 1 deletion sarracenia/transfer/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class File(Transfer):
def __init__(self, proto, options):
super().__init__(proto, options)

self.o.add_option("accelCpCommand", "str", "/usr/bin/cp %s %d")
self.o.add_option("accelCpCommand", "str", "/bin/cp %s %d")
logger.debug("sr_file __init__")
self.cwd = None

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def read(*parts):
],
install_requires=[
"appdirs", "humanfriendly", "humanize", "jsonpickle", "psutil>=5.3.0",
"paramiko", "watchdog",
"watchdog",
],
# when building on HPC redhat, python OS packages don't exist.
# remove the last three lines of install_requires above, aka:
Expand Down
Loading