Skip to content

Commit fc63729

Browse files
chayimchayim
authored
Updating to latest standards (#95)
1 parent 7042ed7 commit fc63729

21 files changed

Lines changed: 1448 additions & 863 deletions

‎.circleci/circle_requirements.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.circleci/config.yml‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎.github/workflows/check-pypi.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Check if required secrets are set to publish to Pypi
22

3-
on: push
3+
on:
4+
push:
5+
branches:
6+
- master
47

58
jobs:
69
checksecret:

‎.github/workflows/integration.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '**/*.md'
7+
- 'examples*/**'
8+
branches:
9+
- master
10+
pull_request:
11+
branches:
12+
- master
13+
workflow_dispatch:
14+
schedule:
15+
- cron: '5 4 * * *'
16+
17+
env:
18+
basepython: 3.9
19+
20+
jobs:
21+
lint:
22+
env:
23+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
24+
name: Code linting
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v3
28+
- name: install base python
29+
uses: actions/setup-python@v4
30+
with:
31+
python-version: ${{env.basepython}}
32+
33+
- name: Cache paths
34+
uses: actions/cache@v2
35+
with:
36+
path: |
37+
.tox
38+
~/.virtualenvs
39+
~/.cache/pip
40+
~/.cache/pypoetry
41+
key: lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
42+
restore-keys: |
43+
lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
44+
45+
- name: prepare the environment
46+
run: |
47+
pip install -U setuptools pip poetry tox-docker tox-poetry
48+
poetry config virtualenvs.create false
49+
poetry install
50+
- name: lint
51+
run: tox -e linters
52+
53+
tests:
54+
runs-on: ubuntu-latest
55+
env:
56+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
57+
strategy:
58+
matrix:
59+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
60+
name: Test Python ${{matrix.python-version}}
61+
steps:
62+
- uses: actions/checkout@v3
63+
- name: install base python
64+
uses: actions/setup-python@v4
65+
with:
66+
python-version: ${{matrix.python-version}}
67+
- name: Cache paths
68+
uses: actions/cache@v2
69+
with:
70+
path: |
71+
.tox
72+
~/.virtualenvs
73+
~/.cache/pip
74+
~/.cache/pypoetry
75+
key: cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
76+
restore-keys: |
77+
cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
78+
79+
- name: prepare the environment
80+
run: |
81+
pip install -U setuptools pip poetry tox-docker tox-poetry
82+
poetry config virtualenvs.create false
83+
poetry install
84+
- name: run tests
85+
run: tox -e cover
86+
- name: Upload coverage
87+
uses: codecov/codecov-action@v2
88+
with:
89+
fail_ci_if_error: false
90+
token: ${{ secrets.CODECOVTOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ ENV/
9696
.Python
9797
dist/
9898
*.egg-info/
99+
coverage.xml

‎MANIFEST.in‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎pyproject.toml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisgraph-bulk-loader"
3-
version = "0.10.2"
3+
version = "0.11.0"
44
description = "RedisGraph Bulk Import Tool"
55
authors = ["Redis Inc <oss@redis.com>"]
66
license = "BSD-3-Clause"
@@ -30,9 +30,9 @@ url = "https://redisgraph.io"
3030
repository = "https://github.com/RedisGraph/redisgraph-bulk-loader"
3131

3232
[tool.poetry.dependencies]
33-
python = "^3.6.0"
33+
python = "^3.6.5"
3434
click = "^8.0.1"
35-
redis = "^4.1.4"
35+
redis = "^4.3.4"
3636
pathos = "^0.2.8"
3737

3838
[tool.poetry.dev-dependencies]
@@ -44,6 +44,10 @@ vulture = "^2.3.0"
4444
pytest = "^6.2.4"
4545
pytest-cov = "^2.12.1"
4646
typing-extensions = "^4.1.1"
47+
black = "^22.6.0"
48+
isort = "^5.10.1"
49+
flynt = "^0.76"
50+
tox-docker = "^3.1.0"
4751

4852
[build-system]
4953
requires = ["poetry-core>=1.0.0"]

‎redisgraph_bulk_loader/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
__all__ = [
2-
'bulk_insert',
2+
"bulk_insert",
33
]

0 commit comments

Comments
 (0)