Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to master #89

Merged
merged 37 commits into from
Oct 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
554edc2
Code now checks for OS and finds executable
Poiuy7312 Sep 15, 2023
de41909
Removed pysqlite3
Poiuy7312 Sep 15, 2023
751799b
Created test case for new function in database.py
Poiuy7312 Sep 15, 2023
274123c
Fixed some formatting
Poiuy7312 Sep 15, 2023
a5b1d25
Testing workflow on branch
Poiuy7312 Sep 16, 2023
b21f144
Changes Runs on
Poiuy7312 Sep 16, 2023
06ba40b
change python version
Poiuy7312 Sep 16, 2023
b442502
Reverted workflow back to original
Poiuy7312 Sep 16, 2023
aa3d5a5
readded visual changes
CalebKendra Sep 19, 2023
5905fd9
fixed format for main and util
CalebKendra Sep 20, 2023
06f2680
Merge branch 'master' into chastenversion
CalebKendra Sep 25, 2023
df9f3e5
import pkg_resources module
Jaclynpqc Sep 25, 2023
a1ec754
include setuptools in dependencies
Jaclynpqc Sep 26, 2023
7ce2baf
Revert "include setuptools in dependencies"
Jaclynpqc Sep 26, 2023
199c477
fix linter
Jaclynpqc Sep 26, 2023
864b90f
added setuptools to poetry
CalebKendra Sep 26, 2023
4d879f9
readded lock file
CalebKendra Sep 26, 2023
8047354
Fix: Get branch up to date with main
Poiuy7312 Sep 26, 2023
e5f2227
Merge branch 'master' into chastenversion
Jaclynpqc Sep 26, 2023
76345c2
Revert commit
Jaclynpqc Sep 26, 2023
1800143
remove pkg_resources
Jaclynpqc Sep 26, 2023
7d413f0
fix: removed pytest fuzzer for test_database.py
Poiuy7312 Sep 27, 2023
1373628
fix: Changed encoding to utf-8 if default fails
Poiuy7312 Sep 29, 2023
6d5e7d4
fix: pyproject.toml reset
CalebKendra Sep 29, 2023
be6b9dd
fix: restore pyproject
CalebKendra Sep 29, 2023
9edc522
fix: restored removed sqlite3
CalebKendra Sep 29, 2023
4c8cc67
fix: file spaces
CalebKendra Sep 29, 2023
54b22ce
style: changed formatting
Poiuy7312 Sep 29, 2023
e8945d7
fix: restore lock file
CalebKendra Sep 29, 2023
b0b4ced
fix lock
CalebKendra Sep 29, 2023
7ef4e1a
lock file revert
CalebKendra Oct 2, 2023
681be87
final lock fix
CalebKendra Oct 2, 2023
9519b95
final lock fix
CalebKendra Oct 2, 2023
f13f658
Merge branch 'chastenversion' of github.com:AstuteSource/chasten into…
CalebKendra Oct 2, 2023
dcc5e78
Merge pull request #52 from AstuteSource/Datasette-serve-fix
Poiuy7312 Oct 13, 2023
699c5b2
Merge pull request #78 from AstuteSource/encoding-fix
simojo Oct 13, 2023
e102e45
Merge pull request #73 from AstuteSource/chastenversion
laurennevill Oct 13, 2023
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
Prev Previous commit
Next Next commit
Testing workflow on branch
  • Loading branch information
Poiuy7312 committed Sep 16, 2023
commit a5b1d2595a001baf391985cb907456400a0f8382
2 changes: 1 addition & 1 deletion .chasten/checks.yml
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ checks:
pattern: './/FunctionDef/body//If[ancestor::If and not(parent::orelse)]'
count:
min: 1
max: 15
max: 15
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ env:
# Focuses on the master branch only
on:
push:
branches: [ master ]
branches: [ master , Datasette-serve-fix]
pull_request:
branches: [ master ]

@@ -22,8 +22,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# Performs all actions on different versions of Python
python-version: ['3.11']
os: [ubuntu-latest]
python-version: ["3.10","3.11"]
include:
- os: macos-latest
python-version: "3.11"
- os: windows-latest
python-version: "3.11"
# Define the workflow steps
steps:
# Checkout the code of the repository