Skip to content

Commit

Permalink
relax dependency version requirements to prepare for new pip resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshKarpel committed Aug 10, 2020
1 parent 6a82c33 commit d07162d
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ ENTRYPOINT ["/home/mapper/htmap/docker/entrypoint.sh"]
CMD ["bash"]

COPY --chown=mapper:mapper . /home/${USER}/htmap
RUN python -m pip install --user --no-cache-dir --disable-pip-version-check "/home/${USER}/htmap[tests,docs]" htcondor==${HTCONDOR_VERSION}.*
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}.*

WORKDIR /home/${USER}/htmap
28 changes: 28 additions & 0 deletions docs/source/versions/v0_6_1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
v0.6.1
======

.. py:currentmodule:: htmap
This version is a drop-in replacement for v0.6.0, except that it relaxes the
version requirements for several dependencies to accommodate upcoming changes
to the
`pip dependency resolver <https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html>`_.


Known Issues
------------

* HTMap does not currently allow "directory content transfers", which is an HTCondor
feature where naming a directory in ``transfer_input_files`` with a trailing
slash transfers the contents of the directory, not the directory itself.
(If you try it, the directory itself will be transferred, as if you had not
used a trailing slash).
Issue: :issue:`215`
* Execution errors that result in the job being terminated but no output being
produced are still not handled entirely gracefully. Right now, the component
state will just show as ``ERRORED``, but there won't be an actual error report.
* Map component state may become corrupted when a map is manually vacated.
Force-removal may be needed to clean up maps if HTCondor and HTMap disagree
about the state of their components.
Issue: :issue:`129`
22 changes: 4 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
[build-system]
requires = ["setuptools >= 40.6.0", "wheel"]
build-backend = "setuptools.build_meta"

[tool.black]
line-length = 100
target-version = ['py36', 'py37', 'py38']
include = '\.pyi?$'
exclude = '''
/(
\.eggs
| \.git
| \.hg
| \.mypy_cache
| \.tox
| \.venv
| _build
| buck-out
| build
| dist
)/
'''

[build-system]
requires = ["setuptools >= 40.6.0", "wheel"]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[pytest]

testspaths = tests
testpaths = tests

console_output_style = count

Expand Down
16 changes: 8 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ python_requires = >=3.6
include_package_data = True
install_requires =
htcondor >= 8.8
cloudpickle ~= 1.4
toml ~= 0.10
tqdm ~= 4.46
click ~= 7.0
click-didyoumean
halo
importlib-metadata ~= 1.0; python_version < "3.8"
cloudpickle >= 1.4
toml >= 0.10
tqdm >= 4.46
click >= 7.0
click-didyoumean>=0.0.3
halo>=0.0.30
importlib-metadata >= 1.0; python_version < "3.8"

[options.extras_require]
tests =
pytest
pytest>=6
pytest-mock
pytest-xdist
pytest-timeout
Expand Down

0 comments on commit d07162d

Please sign in to comment.