Skip to content

Commit aa47b8b

Browse files
committed
Small version number fix
1 parent d938686 commit aa47b8b

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "xcoll"
3-
version = "0.7.0"
3+
version = "0.7.0rc0"
44
description = "Xsuite collimation package"
55
authors = [
66
{name="Frederik F. Van der Veken", email="[email protected]"},
@@ -46,7 +46,7 @@ exclude = ["xcoll/lib", "xcoll/config"]
4646

4747
[poetry.group.dev.dependencies]
4848
pytest = ">=7.3"
49-
xaux = ">=0.3.8"
49+
xaux = ">=0.3.9"
5050

5151
[build-system]
5252
# Needed for pip install -e (BTW: need pip version 22)

tests/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[pytest]
2-
addopts = -ra --durations=10 --durations-min=1 --html='pytest_results.html'
2+
addopts = -ra -vv --durations=10 --durations-min=1 --html='pytest_results.html'
33
generate_report_on_test = True
44
render_collapsed = all

tests/test_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
from xcoll import __version__
77

88
def test_version():
9-
assert __version__ == '0.7.0'
9+
assert __version__ == '0.7.0rc0'

xcoll/general.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# ======================
1313
# Do not change
1414
# ======================
15-
__version__ = '0.7.0'
15+
__version__ = '0.7.0rc0'
1616
# ======================

xcoll/xaux.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ def move_to(self, other, **kwargs):
2424
shutil.move(self, other)
2525
def rmtree(self, *args, **kwargs):
2626
shutil.rmtree(self, *args, **kwargs)
27-
27+
def __eq__(self, other):
28+
try:
29+
other = FsPath(other).expanduser().resolve()
30+
except:
31+
return False
32+
self = self.expanduser().resolve()
33+
return self.as_posix() == other.as_posix()
2834

2935

3036
def ranID(*, length=12, size=1, only_alphanumeric=False):

0 commit comments

Comments
 (0)