Skip to content

MLE-26598 Merging master to dev, bumping pytest #133

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.

Sign up for GitHub

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

Merged
rjrudin merged 7 commits into from
Jan 23, 2026
Merged

MLE-26598 Merging master to dev, bumping pytest #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ae5ad1
Bump nokogiri from 1.18.8 to 1.18.9 in /docs
dependabot[bot] Jul 22, 2025
f5faa10
Merge pull request #114 from marklogic/dependabot/bundler/docs/nokogi…
rjrudin Jul 22, 2025
23b3944
Merge pull request #120 from marklogic/release/1.3.0
rjrudin Aug 6, 2025
653ece9
Bump rexml from 3.3.9 to 3.4.2 in /docs
dependabot[bot] Dec 23, 2025
ddd3f81
MLE-26598 Bumped to 1.3.1
rjrudin Jan 23, 2026
13cfeaf
Merge pull request #132 from marklogic/release/1.3.1
rjrudin Jan 23, 2026
61bd288
MLE-26598 Merging master to dev, bumping pytest
rjrudin Jan 23, 2026
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
2 changes: 1 addition & 1 deletion .copyrightconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ startyear: 2023
# - Use sparingly (third_party, generated, binary assets)
# - Dotfiles already skipped automatically
# Enable by removing the leading '# ' from the next line and editing values.
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, CODEOWNERS, *.lock, *.toml
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, CODEOWNERS, *.lock, *.toml, *.md
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ for getting setup in VSCode with linting and formatting enabled.

Before running any tests, first deploy the test application:

- Use Java 8 or higher
- Use Java 17
Copy link

Copilot AI Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Java version requirement change from 'Java 8 or higher' to 'Java 17' is not mentioned in the PR description or title. This appears to be an unrelated change that should either be removed from this PR or documented in the description explaining why the Java version requirement is being updated.

Suggested change
- Use Java 17
- Use Java 8 or higher

Copilot uses AI. Check for mistakes.
- `cd test-app`
- Create a file named `gradle-local.properties` and add `mlPassword=` to it, with the value of the property being
your admin user's password.
Expand Down Expand Up @@ -105,4 +105,4 @@ though you don't need to perform all of those steps since some of the files gene
4. Run `bundle install` (this may not be necessary due to Gemfile.lock being in version control).
5. Run `bundle exec jekyll serve`.

You can then go to http://localhost:4000 to view the docs.
You can then go to http://localhost:4000 to view the docs.
83 changes: 18 additions & 65 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[tool.poetry]
name = "marklogic-python-client"
version = "1.3.0"
version = "1.3.1"
description = "Python client for MarkLogic, built on the requests library"
authors = ["MarkLogic <general@developer.marklogic.com>"]
readme = "README.md"
packages = [{include = "marklogic"}]
license = "Apache 2.0"

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.10"
requests = "^2.32.5"
requests_toolbelt = "^1.0.0"

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

[tool.poetry.group.test.dependencies]
pytest = "^7.4.0"
pytest = "^9.0.2"

[tool.poetry.group.dev.dependencies]
flake8 = "^7.1.1"
Expand Down