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

For 1 8 36 #956

Merged
merged 6 commits into from
Oct 24, 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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
Expand All @@ -19,7 +19,7 @@ repos:
# hooks:
# - id: bandit
- repo: https://github.com/PyCQA/pylint
rev: v3.0.0a7
rev: v3.0.1
hooks:
- id: pylint
args: ["--disable=C,R,W,E1136"]
9 changes: 8 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@ History

Datacube-ows version 1.8.x indicates that it is designed work with datacube-core versions 1.8.x.

1.8.36 (2023-10-24)
-------------------

* Fix Docker image and CI pipeline (#954)
* Make PYDEV_DEBUG behaviour less counter-intuitive (#955)
* Update HISTORY.rst and increment default version for release (#956)

1.8.35 (2023-09-01)
-------------------

Maintenance release.

* Changes to depenency version pins (#983, #942, #948, #949)
* Changes to dependency version pins (#983, #942, #948, #949)

Includes contributions from @pindge, @emmaai and @SpacemanPaul.

Expand Down
2 changes: 1 addition & 1 deletion datacube_ows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
try:
from ._version import version as __version__
except ImportError:
__version__ = "1.8.35+?"
__version__ = "1.8.36+?"
9 changes: 5 additions & 4 deletions datacube_ows/startup_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ def initialise_ignorable_warnings():
def initialise_debugging(log=None):
# PYCHARM Debugging
if os.environ.get("PYDEV_DEBUG"):
import pydevd_pycharm
pydevd_pycharm.settrace('172.17.0.1', port=12321, stdoutToServer=True, stderrToServer=True)
if log:
log.info("PyCharm Debugging enabled")
if os.environ["PYDEV_DEBUG"].lower() not in ("no", "false", "f", "n"):
import pydevd_pycharm
pydevd_pycharm.settrace('172.17.0.1', port=12321, stdoutToServer=True, stderrToServer=True)
if log:
log.info("PyCharm Debugging enabled")

def before_send(event, hint):
if 'exc_info' in hint:
Expand Down
2 changes: 1 addition & 1 deletion docs/environment_variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Dev Tools
---------

PYDEV_DEBUG:
If set, activates PyDev remote debugging.
If set to anything other than "n", "f", "no" or "false" (case insensitive), activates PyDev remote debugging.

DEFER_CFG_PARSE:
If set, the configuration file is not read and parsed at startup. This
Expand Down
6 changes: 6 additions & 0 deletions tests/test_startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ def test_initialise_nodebugging(monkeypatch):
initialise_debugging()


def test_initialise_explicit_nodebugging(monkeypatch):
monkeypatch.setenv("PYDEV_DEBUG", "no")
from datacube_ows.startup_utils import initialise_debugging
initialise_debugging()


def test_initialise_debugging(monkeypatch):
monkeypatch.setenv("PYDEV_DEBUG", "YES")
from datacube_ows.startup_utils import initialise_debugging
Expand Down
1 change: 1 addition & 0 deletions wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ ee
ef
efd
eg
emmaai
english
entrypoint
enum
Expand Down
Loading