Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mxstack/mxmake
Browse files Browse the repository at this point in the history
  • Loading branch information
rnixx committed Feb 9, 2024
2 parents 511affd + f0f2d43 commit 43d572d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- Remove ruff cache when running `make ruff-clean` target.

- Add `wtr` (Web test runner) domain to `js` topic.
- Fix #20: make VENV_ENABLED=false test does not work.


## 1.0a3 (2024-02-06)
Expand Down
2 changes: 2 additions & 0 deletions src/mxmake/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ def test_mxenv_path(self):
self.assertEqual(utils.mxenv_path(), os.path.join("venv", "bin") + os.path.sep)
os.environ["MXMAKE_MXENV_PATH"] = "other"
self.assertEqual(utils.mxenv_path(), "other" + os.path.sep)
os.environ["MXMAKE_MXENV_PATH"] = ""
self.assertEqual(utils.mxenv_path(), "")
del os.environ["MXMAKE_MXENV_PATH"]

def test_mxmake_files(self):
Expand Down
2 changes: 1 addition & 1 deletion src/mxmake/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def mxenv_path() -> str:
"""MX environment path."""
path = os.environ.get("MXMAKE_MXENV_PATH", os.path.join("venv", "bin"))
if not path.endswith(os.path.sep):
if path and not path.endswith(os.path.sep):
path = f"{path}{os.path.sep}"
return path

Expand Down

0 comments on commit 43d572d

Please sign in to comment.