Skip to content

Commit

Permalink
Updating to latest standards (#95)
Browse files Browse the repository at this point in the history
  • Loading branch information
chayim authored Jul 17, 2022
1 parent 7042ed7 commit fc63729
Show file tree
Hide file tree
Showing 21 changed files with 1,448 additions and 863 deletions.
3 changes: 0 additions & 3 deletions .circleci/circle_requirements.txt

This file was deleted.

144 changes: 0 additions & 144 deletions .circleci/config.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/check-pypi.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Check if required secrets are set to publish to Pypi

on: push
on:
push:
branches:
- master

jobs:
checksecret:
Expand Down
90 changes: 90 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: CI

on:
push:
paths-ignore:
- '**/*.md'
- 'examples*/**'
branches:
- master
pull_request:
branches:
- master
workflow_dispatch:
schedule:
- cron: '5 4 * * *'

env:
basepython: 3.9

jobs:
lint:
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
name: Code linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install base python
uses: actions/setup-python@v4
with:
python-version: ${{env.basepython}}

- name: Cache paths
uses: actions/cache@v2
with:
path: |
.tox
~/.virtualenvs
~/.cache/pip
~/.cache/pypoetry
key: lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
restore-keys: |
lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
- name: prepare the environment
run: |
pip install -U setuptools pip poetry tox-docker tox-poetry
poetry config virtualenvs.create false
poetry install
- name: lint
run: tox -e linters

tests:
runs-on: ubuntu-latest
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
name: Test Python ${{matrix.python-version}}
steps:
- uses: actions/checkout@v3
- name: install base python
uses: actions/setup-python@v4
with:
python-version: ${{matrix.python-version}}
- name: Cache paths
uses: actions/cache@v2
with:
path: |
.tox
~/.virtualenvs
~/.cache/pip
~/.cache/pypoetry
key: cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
restore-keys: |
cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
- name: prepare the environment
run: |
pip install -U setuptools pip poetry tox-docker tox-poetry
poetry config virtualenvs.create false
poetry install
- name: run tests
run: tox -e cover
- name: Upload coverage
uses: codecov/codecov-action@v2
with:
fail_ci_if_error: false
token: ${{ secrets.CODECOVTOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,4 @@ ENV/
.Python
dist/
*.egg-info/
coverage.xml
2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

10 changes: 7 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "redisgraph-bulk-loader"
version = "0.10.2"
version = "0.11.0"
description = "RedisGraph Bulk Import Tool"
authors = ["Redis Inc <oss@redis.com>"]
license = "BSD-3-Clause"
Expand Down Expand Up @@ -30,9 +30,9 @@ url = "https://redisgraph.io"
repository = "https://github.com/RedisGraph/redisgraph-bulk-loader"

[tool.poetry.dependencies]
python = "^3.6.0"
python = "^3.6.5"
click = "^8.0.1"
redis = "^4.1.4"
redis = "^4.3.4"
pathos = "^0.2.8"

[tool.poetry.dev-dependencies]
Expand All @@ -44,6 +44,10 @@ vulture = "^2.3.0"
pytest = "^6.2.4"
pytest-cov = "^2.12.1"
typing-extensions = "^4.1.1"
black = "^22.6.0"
isort = "^5.10.1"
flynt = "^0.76"
tox-docker = "^3.1.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion redisgraph_bulk_loader/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__all__ = [
'bulk_insert',
"bulk_insert",
]
Loading

0 comments on commit fc63729

Please sign in to comment.