Skip to content

Commit 18f5f01

Browse files
authored
Merge pull request #371 from Lorak-mmk/various-improvements
Updates for documentation and some cleanups
2 parents 059e10e + ddda304 commit 18f5f01

Some content is hidden

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

45 files changed

+88
-6974
lines changed

.github/pull_request_template.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## Pre-review checklist
2+
3+
<!--
4+
Make sure you took care of the issues on the list.
5+
Put 'x' into those boxes which apply.
6+
You can also create the PR now and click on all relevant checkboxes.
7+
See CONTRIBUTING.rst for more details.
8+
-->
9+
10+
- [ ] I have split my patch into logically separate commits.
11+
- [ ] All commit messages clearly explain what they change and why.
12+
- [ ] I added relevant tests for new features and bug fixes.
13+
- [ ] All commits compile, pass static checks and pass test.
14+
- [ ] PR description sums up the changes and reasons why they should be introduced.
15+
- [ ] I have provided docstrings for the public items that I want to introduce.
16+
- [ ] I have adjusted the documentation in `./docs/source/`.
17+
- [ ] I added appropriate `Fixes:` annotations to PR description.

.github/workflows/build-pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build pre release python versions
33
on: [push, pull_request]
44

55
env:
6-
CIBW_TEST_COMMAND_LINUX: "pytest --import-mode append {project}/tests/unit -k 'not (test_connection_initialization or test_cloud)'"
6+
CIBW_TEST_COMMAND_LINUX: "pytest {project}/tests/unit"
77
CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt"
88
CIBW_BEFORE_BUILD_LINUX: "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
99
CIBW_ENVIRONMENT: "CASS_DRIVER_BUILD_CONCURRENCY=2 CFLAGS='-g0 -O3'"

.github/workflows/build-push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on: [push, pull_request]
44

55

66
env:
7-
CIBW_TEST_COMMAND_LINUX: "pytest --import-mode append {project}/tests/unit -k 'not (test_connection_initialization or test_cloud)' && EVENT_LOOP_MANAGER=gevent pytest --import-mode append {project}/tests/unit/io/test_geventreactor.py"
8-
CIBW_TEST_COMMAND_MACOS: "pytest --import-mode append {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_connection_initialization or test_timer_cancellation or test_cloud)' "
9-
CIBW_TEST_COMMAND_WINDOWS: "pytest --import-mode append {project}/tests/unit -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor or test_connection_initialization or test_cloud)\" "
7+
CIBW_TEST_COMMAND_LINUX: "pytest {project}/tests/unit && EVENT_LOOP_MANAGER=gevent pytest {project}/tests/unit/io/test_geventreactor.py"
8+
CIBW_TEST_COMMAND_MACOS: "pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)' "
9+
CIBW_TEST_COMMAND_WINDOWS: "pytest {project}/tests/unit -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\" "
1010
CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt"
1111
CIBW_BEFORE_BUILD_LINUX: "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
1212
CIBW_ENVIRONMENT: "CASS_DRIVER_BUILD_CONCURRENCY=2 CFLAGS='-g0 -O3'"

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
run: |
3434
export EVENT_LOOP_MANAGER=${{ matrix.event_loop_manager }}
3535
export SCYLLA_VERSION='release:5.1'
36-
./ci/run_integration_test.sh tests/integration/standard/ tests/integration/cqlengine/
36+
./scripts/run_integration_test.sh tests/integration/standard/ tests/integration/cqlengine/
3737
3838
- name: Test tablets
3939
run: |
4040
export EVENT_LOOP_MANAGER=${{ matrix.event_loop_manager }}
4141
export SCYLLA_VERSION='release:6.0.2'
42-
./ci/run_integration_test.sh tests/integration/experiments/
42+
./scripts/run_integration_test.sh tests/integration/experiments/

.gitignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,24 @@ tests/unit/cython/bytesio_testhelper.c
4343
#iPython
4444
*.ipynb
4545

46+
# Files from upstream that we don't need
47+
Jenkinsfile
48+
Jenkinsfile.bak
49+
appveyor.yml
50+
appveyor/appveyor.ps1
51+
appveyor/run_test.ps1
52+
build.yaml.bak
53+
docs.yaml
54+
doxyfile
55+
tox.ini
56+
test-datastax-requirements.txt
57+
docs/api/cassandra/datastax/graph/fluent/index.rst
58+
docs/api/cassandra/datastax/graph/fluent/predicates.rst
59+
docs/api/cassandra/datastax/graph/fluent/query.rst
60+
docs/api/cassandra/datastax/graph/index.rst
61+
docs/api/cassandra/graph.rst
62+
docs/classic_graph.rst
63+
docs/core_graph.rst
64+
docs/geo_types.rst
65+
docs/graph.rst
66+
docs/graph_fluent.rst

CONTRIBUTING.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contributions are welcome in the form of bug reports or pull requests.
55

66
Bug Reports
77
-----------
8-
Quality bug reports are welcome at the `DataStax Python Driver JIRA <https://datastax-oss.atlassian.net/browse/PYTHON>`_.
8+
Quality bug reports are welcome at the `Scylla Python Driver Github <https://github.com/scylladb/python-driver/issues>`_.
99

1010
There are plenty of `good resources <http://www.drmaciver.com/2013/09/how-to-submit-a-decent-bug-report/>`_ describing how to create
1111
good bug reports. They will not be repeated in detail here, but in general, the bug report include where appropriate:
@@ -18,11 +18,7 @@ good bug reports. They will not be repeated in detail here, but in general, the
1818
Pull Requests
1919
-------------
2020
If you're able to fix a bug yourself, you can `fork the repository <https://help.github.com/articles/fork-a-repo/>`_ and submit a `Pull Request <https://help.github.com/articles/using-pull-requests/>`_ with the fix.
21-
Please include tests demonstrating the issue and fix. For examples of how to run the tests, consult the `dev README <https://github.com/datastax/python-driver/blob/master/README-dev.rst#running-the-tests>`_.
22-
23-
Contribution License Agreement
24-
------------------------------
25-
To protect the community, all contributors are required to `sign the DataStax Contribution License Agreement <http://cla.datastax.com/>`_. The process is completely electronic and should only take a few minutes.
21+
Please include tests demonstrating the issue and fix. For examples of how to run the tests, consult the `dev README <https://github.com/scylladb/python-driver/blob/master/README-dev.rst#running-the-tests>`_.
2622

2723
Design and Implementation Guidelines
2824
------------------------------------

0 commit comments

Comments
 (0)