Skip to content

Commit 923abaa

Browse files
committed
MLE-26598 Merging master to dev, bumping pytest
pytest 7 has a high vulnerability, though it's a test dependency. This bumps it to the latest version. Also bumping the Python version needed for development to 3.10 to support pytest 9.
1 parent 9a03305 commit 923abaa

4 files changed

Lines changed: 23 additions & 70 deletions

File tree

.copyrightconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ startyear: 2023
1010
# - Use sparingly (third_party, generated, binary assets)
1111
# - Dotfiles already skipped automatically
1212
# Enable by removing the leading '# ' from the next line and editing values.
13-
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, CODEOWNERS, *.lock, *.toml
13+
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, CODEOWNERS, *.lock, *.toml, *.md

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for getting setup in VSCode with linting and formatting enabled.
2222

2323
Before running any tests, first deploy the test application:
2424

25-
- Use Java 8 or higher
25+
- Use Java 17
2626
- `cd test-app`
2727
- Create a file named `gradle-local.properties` and add `mlPassword=` to it, with the value of the property being
2828
your admin user's password.
@@ -105,4 +105,4 @@ though you don't need to perform all of those steps since some of the files gene
105105
4. Run `bundle install` (this may not be necessary due to Gemfile.lock being in version control).
106106
5. Run `bundle exec jekyll serve`.
107107

108-
You can then go to http://localhost:4000 to view the docs.
108+
You can then go to http://localhost:4000 to view the docs.

poetry.lock

Lines changed: 18 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ packages = [{include = "marklogic"}]
88
license = "Apache 2.0"
99

1010
[tool.poetry.dependencies]
11-
python = "^3.9"
11+
python = "^3.10"
1212
requests = "^2.32.5"
1313
requests_toolbelt = "^1.0.0"
1414

1515
# Forcing version to eliminate CVEs; transitive dependency of requests.
1616
urllib3 = "^2.6.3"
1717

1818
[tool.poetry.group.test.dependencies]
19-
pytest = "^7.4.0"
19+
pytest = "^9.0.2"
2020

2121
[tool.poetry.group.dev.dependencies]
2222
flake8 = "^7.1.1"

0 commit comments

Comments
 (0)