Skip to content

Commit 860e2c5

Browse files
authored
Merge pull request #225 from htcondor/v0.6.1
v0.6.1
2 parents 6a82c33 + fa6bddb commit 860e2c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+217
-268
lines changed

.pre-commit-config.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v3.1.0
5+
rev: v3.2.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
@@ -30,3 +30,15 @@ repos:
3030
rev: v2.0.0
3131
hooks:
3232
- id: hadolint
33+
- repo: https://github.com/asottile/setup-cfg-fmt
34+
rev: v1.11.0
35+
hooks:
36+
- id: setup-cfg-fmt
37+
- repo: https://github.com/asottile/seed-isort-config
38+
rev: v2.2.0
39+
hooks:
40+
- id: seed-isort-config
41+
- repo: https://github.com/timothycrosley/isort
42+
rev: 5.3.2
43+
hooks:
44+
- id: isort

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ ENTRYPOINT ["/home/mapper/htmap/docker/entrypoint.sh"]
6767
CMD ["bash"]
6868

6969
COPY --chown=mapper:mapper . /home/${USER}/htmap
70-
RUN python -m pip install --user --no-cache-dir --disable-pip-version-check "/home/${USER}/htmap[tests,docs]" htcondor==${HTCONDOR_VERSION}.*
70+
RUN python -m pip install --user --no-cache-dir --disable-pip-version-check --use-feature=2020-resolver "/home/${USER}/htmap[tests,docs]" htcondor==${HTCONDOR_VERSION}.*
7171

7272
WORKDIR /home/${USER}/htmap

docs/source/versions/v0_6_1.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
v0.6.1
2+
======
3+
4+
.. py:currentmodule:: htmap
5+
6+
7+
This version is a drop-in replacement for v0.6.0, except that it relaxes the
8+
version requirements for several dependencies to accommodate upcoming changes
9+
to the
10+
`pip dependency resolver <https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html>`_.
11+
12+
13+
Known Issues
14+
------------
15+
16+
* HTMap does not currently allow "directory content transfers", which is an HTCondor
17+
feature where naming a directory in ``transfer_input_files`` with a trailing
18+
slash transfers the contents of the directory, not the directory itself.
19+
(If you try it, the directory itself will be transferred, as if you had not
20+
used a trailing slash).
21+
Issue: :issue:`215`
22+
* Execution errors that result in the job being terminated but no output being
23+
produced are still not handled entirely gracefully. Right now, the component
24+
state will just show as ``ERRORED``, but there won't be an actual error report.
25+
* Map component state may become corrupted when a map is manually vacated.
26+
Force-removal may be needed to clean up maps if HTCondor and HTMap disagree
27+
about the state of their components.
28+
Issue: :issue:`129`

htmap/__init__.py

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,34 @@
1616

1717
import logging as _logging
1818

19+
from .settings import BASE_SETTINGS, USER_SETTINGS, settings
1920
from .version import __version__, version, version_info
2021

21-
from .settings import settings, USER_SETTINGS, BASE_SETTINGS
22-
2322
# SET UP NULL LOG HANDLER
2423
_logger = _logging.getLogger(__name__)
2524
_logger.setLevel(_logging.DEBUG)
2625
_logger.addHandler(_logging.NullHandler())
2726

28-
from .mapping import (
29-
map,
30-
starmap,
31-
build_map,
32-
MapBuilder,
33-
)
34-
from .mapped import mapped, MappedFunction
35-
from .maps import (
36-
Map,
37-
MapStdOut,
38-
MapStdErr,
39-
MapOutputFiles,
40-
)
41-
from .holds import ComponentHold
27+
from . import _startup, exceptions
28+
from .checkpointing import checkpoint
4229
from .errors import ComponentError
43-
from .state import ComponentStatus
44-
from .options import MapOptions, register_delivery_method
30+
from .holds import ComponentHold
4531
from .management import (
46-
status,
47-
status_json,
48-
status_csv,
32+
Transplant,
33+
clean,
4934
load,
5035
load_maps,
5136
remove,
52-
clean,
53-
Transplant,
54-
transplants,
37+
status,
38+
status_csv,
39+
status_json,
5540
transplant_info,
41+
transplants,
5642
)
43+
from .mapped import MappedFunction, mapped
44+
from .mapping import MapBuilder, build_map, map, starmap
45+
from .maps import Map, MapOutputFiles, MapStdErr, MapStdOut
46+
from .options import MapOptions, register_delivery_method
47+
from .state import ComponentStatus
5748
from .tags import get_tags
58-
from .checkpointing import checkpoint
5949
from .transfer import TransferPath, transfer_output_files
60-
from . import exceptions
61-
62-
from . import _startup

htmap/__main__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from .cli import cli
22

3-
43
if __name__ == "__main__":
54
exit(cli.main(prog_name="htmap"))

htmap/_startup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import os
21
import logging
2+
import os
33
from logging import handlers
44
from pathlib import Path
55

6-
from . import settings, names
6+
from . import names, settings
77

88
logger = logging.getLogger("htmap")
99

htmap/checkpointing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# limitations under the License.
1515

1616
import os
17-
from pathlib import Path
1817
import shutil
18+
from pathlib import Path
1919

2020
from . import names
2121

htmap/cli.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,26 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
from typing import Optional, List, Collection, Tuple
17-
18-
import logging
19-
import sys
20-
import time
2116
import collections
22-
import random
2317
import functools
18+
import logging
19+
import random
2420
import shutil
21+
import sys
22+
import time
2523
from pathlib import Path
26-
27-
import htcondor
28-
import htmap
29-
from htmap import names, __version__
30-
from htmap.management import _status, read_events
24+
from typing import Collection, List, Optional, Tuple
3125

3226
import click
27+
import htcondor
3328
from click_didyoumean import DYMGroup
34-
3529
from halo import Halo
3630
from spinners import Spinners
3731

32+
import htmap
33+
from htmap import __version__, names
34+
from htmap.management import _status, read_events
35+
3836
logger = logging.getLogger(__name__)
3937
logger.setLevel(logging.DEBUG)
4038

htmap/htio.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
from typing import Any, List, Iterator, Callable, Iterable
17-
import logging
18-
1916
import gzip
2017
import json
18+
import logging
2119
from pathlib import Path
20+
from typing import Any, Callable, Iterable, Iterator, List
2221

2322
import cloudpickle
2423
import htcondor

htmap/management.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
from typing import Tuple, Iterable, Dict, Union, NamedTuple, Callable, List, Optional
17-
import logging
18-
19-
from pathlib import Path
20-
import datetime
2116
import collections
22-
import json
2317
import csv
18+
import datetime
2419
import io
25-
import textwrap
20+
import json
21+
import logging
2622
import shutil
23+
import textwrap
2724
import uuid
2825
from concurrent.futures.thread import ThreadPoolExecutor
26+
from pathlib import Path
27+
from typing import Callable, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
2928

30-
from . import maps, tags, mapping, utils, state, names, settings, exceptions
29+
from . import exceptions, mapping, maps, names, settings, state, tags, utils
3130

3231
logger = logging.getLogger(__name__)
3332

0 commit comments

Comments
 (0)