Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ There is primarily 3 things to consider when looking to contribute.

After considering the above, you may comment on the issue you'd like to help fix and a maintainer will assign it to you.

## What is the proper pull request (PR) etiquette?
## What is the proper etiquette for proposing changes as contribution?

What is generally expected from new pull requests are the following:
What is generally expected from new contributions are the following:

- Any proposed contributor changes should be introduced in the form of a pull request (PR) from their fork.
- Proper branch target specified. The following is generally the available branches that can be targeted:
- `master` or `main`: Represents the single source of truth and the latest in completed development.
- `pre`: Represents the source at the point of the last stable release.
Expand All @@ -30,6 +31,8 @@ What is generally expected from new pull requests are the following:
3. No style errors e.g. PEP8, etc.
4. Similar or better code coverage
- Additional documentation to reflect new feature or behavior introduced.
- A contributor should not approve or merge their own PR.
- Reviewer suggestions or feedback should not be directly committed to a branch on contributor's fork. A less intrusive way to collaborate would be for the reviewer to PR to the contributor's fork/branch that is associated with the main PR currently in review.

Maintainers will also ensure that PR's have the appropriate assignment for reviewer, milestone, and project.

Expand Down
2 changes: 1 addition & 1 deletion dj_gui_api_server/DJConnector.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def delete_tuple(jwt_payload: dict, schema_name: str, table_name: str,
raise InvalidDeleteRequest('Nothing to delete')

# All check pass thus proceed to delete
tuple_to_delete.delete_quick()
tuple_to_delete.delete(safemode=False)

@staticmethod
def get_table_object(schema_virtual_module, table_name: str):
Expand Down
2 changes: 1 addition & 1 deletion dj_gui_api_server/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""DJGUI API metadata."""
__version__ = '0.0.0'
__version__ = '0.1.0a0'
4 changes: 2 additions & 2 deletions local-docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ services:
- FLASK_ENV=development # enables logging to console from Flask
networks:
- dj-gui-api
# volumes: # can enable this for development to bypass build times
# - ./dj_gui_api_server:/opt/conda/lib/python3.8/site-packages/dj_gui_api_server
volumes: # to bypass build times. Should disable for PROD
- ./dj_gui_api_server:/opt/conda/lib/python3.8/site-packages/dj_gui_api_server
ports:
- "5000:5000"
working_dir: /main
Expand Down