Skip to content

Commit 0a5bc24

Browse files
committed
Merge branch 'master' into vdimir/join_select_inner_table
2 parents 7ae8a1f + 62368fb commit 0a5bc24

137 files changed

Lines changed: 2329 additions & 754 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ Keep an eye out for upcoming meetups and events around the world. Somewhere else
4343

4444
Upcoming meetups
4545

46-
* [Ghent Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/303049405/) - November 19
47-
* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/303096434) - November 26
4846
* [Amsterdam Meetup](https://www.meetup.com/clickhouse-netherlands-user-group/events/303638814) - December 3
4947
* [Stockholm Meetup](https://www.meetup.com/clickhouse-stockholm-user-group/events/304382411) - December 9
5048
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/304268174) - December 9
@@ -54,6 +52,8 @@ Upcoming meetups
5452

5553
Recently completed meetups
5654

55+
* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/303096434) - November 26
56+
* [Ghent Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/303049405/) - November 19
5757
* [Barcelona Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096876/) - November 12
5858
* [Madrid Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096564/) - October 22
5959
* [Singapore Meetup](https://www.meetup.com/clickhouse-singapore-meetup-group/events/303212064/) - October 3

ci/praktika/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
from .job import Job
44
from .secret import Secret
55
from .workflow import Workflow
6+
7+
__all__ = ["Artifact", "Docker", "Job", "Secret", "Workflow"]

ci/praktika/__main__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import argparse
22
import sys
33

4-
from praktika.html_prepare import Html
5-
from praktika.utils import Utils
6-
from praktika.validator import Validator
7-
from praktika.yaml_generator import YamlGenerator
4+
from .html_prepare import Html
5+
from .utils import Utils
6+
from .validator import Validator
7+
from .yaml_generator import YamlGenerator
88

99

1010
def create_parser():
@@ -86,8 +86,8 @@ def main():
8686
elif args.command == "html":
8787
Html.prepare()
8888
elif args.command == "run":
89-
from praktika.mangle import _get_workflows
90-
from praktika.runner import Runner
89+
from .mangle import _get_workflows
90+
from .runner import Runner
9191

9292
workflows = _get_workflows(name=args.workflow or None)
9393
job_workflow_pairs = []

ci/praktika/_environment.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
from types import SimpleNamespace
66
from typing import Any, Dict, List, Type
77

8-
from praktika import Workflow
9-
from praktika.settings import Settings
10-
from praktika.utils import MetaClasses, T
8+
from . import Workflow
9+
from .settings import Settings
10+
from .utils import MetaClasses, T
1111

1212

1313
@dataclasses.dataclass

ci/praktika/cache.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import json
33
from pathlib import Path
44

5-
from praktika import Artifact, Job, Workflow
6-
from praktika._environment import _Environment
7-
from praktika.digest import Digest
8-
from praktika.s3 import S3
9-
from praktika.settings import Settings
10-
from praktika.utils import Utils
5+
from . import Artifact, Job, Workflow
6+
from ._environment import _Environment
7+
from .digest import Digest
8+
from .s3 import S3
9+
from .settings import Settings
10+
from .utils import Utils
1111

1212

1313
class Cache:

ci/praktika/cidb.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
from typing import Optional
55

66
import requests
7-
from praktika._environment import _Environment
8-
from praktika.result import Result
9-
from praktika.settings import Settings
10-
from praktika.utils import Utils
7+
8+
from ._environment import _Environment
9+
from .result import Result
10+
from .settings import Settings
11+
from .utils import Utils
1112

1213

1314
class CIDB:

ci/praktika/digest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
from pathlib import Path
66
from typing import List
77

8-
from praktika import Job
9-
from praktika.docker import Docker
10-
from praktika.settings import Settings
11-
from praktika.utils import Utils
8+
from . import Job
9+
from .docker import Docker
10+
from .settings import Settings
11+
from .utils import Utils
1212

1313

1414
class Digest:

ci/praktika/docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import dataclasses
22
from typing import List
33

4-
from praktika.utils import Shell
4+
from .utils import Shell
55

66

77
class Docker:

ci/praktika/execution/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#!/usr/bin/env python

ci/praktika/execution/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from praktika.execution.machine_init import run
1+
from .machine_init import run
22

33
if __name__ == "__main__":
44
run()

0 commit comments

Comments
 (0)