Skip to content

Commit

Permalink
Merge branch 'master' into 11
Browse files Browse the repository at this point in the history
  • Loading branch information
klobuczek committed Jan 1, 2024
2 parents 3bf8aa8 + 3c89aef commit b2a3839
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -9,11 +9,11 @@ Pull request with high test coverage and good [code climate](https://codeclimate

# Rubocop

We use [rubocop](https://github.com/bbatsov/rubocop) for sanity checks to make sure our code doesn't get too ugly. Because of this, a pull request can fail on Travis CI when the specs all run fine. We recommend installing [overcommit](https://github.com/causes/overcommit) so that rubocop is run in pre-commit hooks so that this causes minimal frustration. We already have an overcommit configuration, so you simply need to run `overcommit --install` to set up the git hooks (note: if using our Vagrantfile, this is handled for you). A `Guardfile` is also provided so that you can use rspec and rubocop continuously while working.
We use [rubocop](https://github.com/bbatsov/rubocop) for sanity checks to make sure our code doesn't get too ugly. Because of this, a pull request can fail in CI when the specs all run fine. We recommend installing [overcommit](https://github.com/causes/overcommit) so that rubocop is run in pre-commit hooks so that this causes minimal frustration. We already have an overcommit configuration, so you simply need to run `overcommit --install` to set up the git hooks (note: if using our Vagrantfile, this is handled for you). A `Guardfile` is also provided so that you can use rspec and rubocop continuously while working.

# Travis CI
# CI

We use Travis CI to test across multiple verisons of ruby and versions of Neo4j, so please watch for failures there.
We use Github Actions to test across multiple versions of ruby and versions of Neo4j, so please watch for failures there.

# Guard

Expand Down
34 changes: 17 additions & 17 deletions README.md
Expand Up @@ -3,15 +3,15 @@
## Code Status

[![Actively Maintained](https://img.shields.io/badge/Maintenance%20Level-Actively%20Maintained-green.svg)](https://gist.github.com/cheerfulstoic/d107229326a01ff0f333a1d3476e068d)
[![Build Status](https://secure.travis-ci.org/neo4jrb/neo4j.svg?branch=master)](http://travis-ci.org/neo4jrb/neo4j)
[![Build Status](https://github.com/neo4jrb/activegraph/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/neo4jrb/activegraph/actions)
[![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j/badge.svg?branch=master)](https://coveralls.io/r/neo4jrb/neo4j?branch=master)
[![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j.svg)](https://codeclimate.com/github/neo4jrb/neo4j)

## Get Support

### Documentation

All new documentation will be done via our [readthedocs](http://neo4jrb.readthedocs.org) site, though some old documentation has yet to be moved from our [wiki](https://github.com/neo4jrb/neo4j/wiki)
All new documentation will be done via our [readthedocs](http://neo4jrb.readthedocs.org) site, though some old documentation has yet to be moved from our [wiki](https://github.com/neo4jrb/neo4j/wiki)

### Contact Us

Expand Down Expand Up @@ -47,28 +47,28 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]

| **Neo4j Version** | v2.x | v3.x | >= v4.x | >= 7.0.3 | activegraph 10 | activegraph 11.1 |
|-------------------|------|-------|---------|----------|------------------|------------------|
| 1.9.x | Yes | No | No | No | No | No
| 2.0.x | No | Yes | No | No | No | No
| 2.1.x | No | Yes | Yes * | Yes | No | No
| 2.2.x | No | No | Yes | Yes | No | No
| 2.3.x | No | No | Yes | Yes | No | No
| 3.0, 3.1, 3.3 | No | No | No | Yes | No | No
| 3.4 | No | No | No | Yes | Yes | No
| 3.5 | No | No | No | Yes | Yes | Yes
| 4.0 | No | No | No | No | Yes | Yes
| 4.1 | No | No | No | No | No | Yes
| 4.2 | No | No | No | No | No | Yes
| 4.3 | No | No | No | No | No | Yes
| 4.4 | No | No | No | No | No | Yes
| 5.x | No | No | No | No | No | Yes
| 1.9.x | Yes | No | No | No | No | No |
| 2.0.x | No | Yes | No | No | No | No |
| 2.1.x | No | Yes | Yes * | Yes | No | No |
| 2.2.x | No | No | Yes | Yes | No | No |
| 2.3.x | No | No | Yes | Yes | No | No |
| 3.0, 3.1, 3.3 | No | No | No | Yes | No | No |
| 3.4 | No | No | No | Yes | Yes | No |
| 3.5 | No | No | No | Yes | Yes | Yes |
| 4.0 | No | No | No | No | Yes | Yes |
| 4.1 | No | No | No | No | No | Yes |
| 4.2 | No | No | No | No | No | Yes |
| 4.3 | No | No | No | No | No | Yes |
| 4.4 | No | No | No | No | No | Yes |
| 5.x | No | No | No | No | No | Yes |

`*` Neo4j.rb >= 4.x doesn't support Neo4j versions before 2.1.5. To use 2.1.x you should upgrade to a version >= 2.1.5

## Neo4j feature support

| **Neo4j Feature** | v2.x | v3.x | >= v4.x | >= 8.x | >= activegraph 10.0 |
|----------------------------|--------|------|---------|--------|---------------------|
| Bolt Protocol | No | No | No | Yes | Yes |
| Bolt Protocol | No | No | No | Yes | Yes |
| Auth | No | No | Yes | Yes | Yes |
| Remote Cypher | Yes | Yes | Yes | Yes | No |
| Transactions | Yes | Yes | Yes | Yes | Yes |
Expand Down
2 changes: 1 addition & 1 deletion docs/Contributing.rst
Expand Up @@ -49,7 +49,7 @@ We use:

Please try to check at least the RSpec tests and Rubocop before making your pull request. ``Guardfile`` and ``.overcommit.yml`` files are available if you would like to use ``guard`` (for RSpec and rubocop) and/or overcommit.

We also use Travis CI to make sure all of these pass for each pull request. Travis runs the specs across multiple versions of Ruby and multiple Neo4j databases, so be aware of that for potential build failures.
We also use GitHub actions to make sure all of these pass for each pull request. GitHub actions runs the specs across multiple versions of Ruby and multiple Neo4j databases, so be aware of that for potential build failures.

Documentation
~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
@@ -1,4 +1,4 @@
# To run coverage via travis
# To run coverage in CI
require 'simplecov'
require 'dotenv'
require 'timecop'
Expand Down

0 comments on commit b2a3839

Please sign in to comment.