Skip to content

Commit

Permalink
Reapply "Merge branch 'main' into develop"
Browse files Browse the repository at this point in the history
This reverts commit 142e18d.
  • Loading branch information
jfcalvo committed May 9, 2024
1 parent 142e18d commit 65bee83
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ These are the section headers that we use:

- Fixed Korean character reversed. ([#4753](https://github.com/argilla-io/argilla/pull/4753))

### Fixed

- Fixed requirements for version of wrapt library conflicting with Python 3.11 ([#4693](https://github.com/argilla-io/argilla/pull/4693))

## [1.27.0](https://github.com/argilla-io/argilla/compare/v1.26.1...v1.27.0)

### Added
Expand Down
2 changes: 1 addition & 1 deletion environment_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ dependencies:
- nltk < 4.0.0
- httpx~=0.26.0
# For now we can just install argilla-server from the GitHub repo
- git+https://github.com/argilla-io/argilla-server.git@v1.28.0
- git+https://github.com/argilla-io/argilla-server.git
# install Argilla in editable mode
- -e .[listeners]
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argilla",
"version": "1.28.0",
"version": "1.29.0-dev",
"private": true,
"scripts": {
"dev": "nuxt",
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
# Aligned pydantic version with server fastAPI
"pydantic >= 1.10.7",
# monitoring
"wrapt >= 1.13,< 1.15",
"wrapt >= 1.14,< 1.15",
# weaksupervision
"numpy < 1.24.0",
# for progressbars
Expand All @@ -47,8 +47,8 @@ dependencies = [
dynamic = ["version"]

[project.optional-dependencies]
server = ["argilla-server ~= 1.28.0"]
server-postgresql = ["argilla-server[postgresql] ~= 1.28.0"]
server = ["argilla-server"]
server-postgresql = ["argilla-server[postgresql]"]
listeners = ["schedule ~= 1.1.0"]
integrations = [
"PyYAML >= 5.4.1,< 6.1.0", # Required by `argilla.client.feedback.config` just used in `HuggingFaceDatasetMixin`
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.

# coding: utf-8
version = "1.28.0"
version = "1.29.0-dev"

0 comments on commit 65bee83

Please sign in to comment.