Skip to content

Commit 124e486

Browse files
authored
Merge pull request #34 from adaa-polsl/develop
v2.1.21.0
2 parents 883c8f1 + bc52204 commit 124e486

File tree

76 files changed

+13068
-13766
lines changed

Some content is hidden

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

76 files changed

+13068
-13766
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,6 @@ classification_tabular_datasets/
294294
.coverage
295295
junit.xml
296296
a.ipynb
297-
java.logs
297+
java.logs
298+
do_arta/
299+
tutorials_env/

docs/HOW_TO_DEPLOY.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
# Deployment instruction
22

3-
> Don't forger to change version before deployment!
43
> Deployment **MUST** be done from the `main` branch only!
54
6-
### 1. Create tag in Github repository
5+
## 1. Change version
6+
7+
Version is stored in few places (unfortunately):
8+
* `main.py` file, `__RULEKIT_RELEASE_VERSION__` variable should be set to the *.jar version of the RuleKit library used by this specific package version
9+
* `main.py` file, `__VERSION__` variable specify additional version number which should be elevated only when given release includes changes in Python but still uses the same *.jar version as the last existing release.
10+
* `setup.py` version should be the same as `__VERSION__` in `main.py` file
11+
12+
To sum up:
13+
* If you migrate to new *.jar file -> change `__RULEKIT_RELEASE_VERSION__` and version in `setup.py`
14+
* If you change something in the package itself and continue to use the same version of RuleKit jar file -> bump only the last number of `__VERSION__`
15+
16+
> ⚠️ **Always update version in `setup.py` to match `__VERSION__` from the `main.py` file!**
17+
18+
### 2. Create tag in Github repository
719
Create tag on current commit named `v{CURRENT_VERSION}`
820

921
### 2. Create release in Github

docs/badges/coverage-badge.svg

+1-1
Loading

docs/badges/flake8-badge.svg

+1-1
Loading

docs/badges/test-badge.svg

+1-1
Loading

docs/generate_readme_badges.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def main():
7070
print('Updating badges')
7171
cwd = pathlib.Path(curr_dir_path / '..') # root repo dir
7272

73-
generate_tests_coverage_badge(cwd)
74-
generate_test_badge(cwd)
73+
# generate_tests_coverage_badge(cwd)
74+
# generate_test_badge(cwd)
7575
generate_flake8_badge(cwd)
7676

7777
print('Badges generated successfully!')

docs/helpers.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ def run_command(command: list[str], cwd: Optional[str] = None, raise_on_error: b
1111
)
1212
output, error = process.communicate()
1313
if process.returncode != 0 and raise_on_error:
14-
raise Exception("File handling failed %d %s %s" %
15-
(process.returncode, output, error)
14+
print(error.decode())
15+
raise Exception("Command run failed %d %s" %
16+
(process.returncode, error)
1617
)
1718

1819
print(output.decode())

0 commit comments

Comments
 (0)