From d390a024dc3ee1125d248c1b02eeb6ad464f643c Mon Sep 17 00:00:00 2001 From: Francisco Aranda Date: Tue, 29 Oct 2024 10:53:47 +0100 Subject: [PATCH 01/23] chore: Set release version --- argilla-frontend/CHANGELOG.md | 2 ++ argilla-frontend/package.json | 2 +- argilla-server/CHANGELOG.md | 2 ++ argilla-server/src/argilla_server/_version.py | 2 +- argilla/CHANGELOG.md | 2 ++ argilla/src/argilla/_version.py | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/argilla-frontend/CHANGELOG.md b/argilla-frontend/CHANGELOG.md index b09deef8cf..c8e1d4f904 100644 --- a/argilla-frontend/CHANGELOG.md +++ b/argilla-frontend/CHANGELOG.md @@ -16,6 +16,8 @@ These are the section headers that we use: ## [Unreleased]() +## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.0...v2.4.0) + ### Fixed - Refine German translations and update non-localized UI elements [#5632](https://github.com/argilla-io/argilla/pull/5632) diff --git a/argilla-frontend/package.json b/argilla-frontend/package.json index 68cfd74bd4..8af809ce30 100644 --- a/argilla-frontend/package.json +++ b/argilla-frontend/package.json @@ -1,6 +1,6 @@ { "name": "argilla", - "version": "2.4.0dev0", + "version": "2.4.0", "private": true, "scripts": { "dev": "nuxt", diff --git a/argilla-server/CHANGELOG.md b/argilla-server/CHANGELOG.md index 4227b169ce..fc4f3b6ec5 100644 --- a/argilla-server/CHANGELOG.md +++ b/argilla-server/CHANGELOG.md @@ -16,6 +16,8 @@ These are the section headers that we use: ## [Unreleased]() +## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.1...v2.4.0) + ### Added - Added new `metadata` attribute for endpoints getting, creating and updating Datasets so now it is possible to store metadata associated to a dataset. ([#5586](https://github.com/argilla-io/argilla/pull/5586)) diff --git a/argilla-server/src/argilla_server/_version.py b/argilla-server/src/argilla_server/_version.py index 4644ac82a4..cbb95518ab 100644 --- a/argilla-server/src/argilla_server/_version.py +++ b/argilla-server/src/argilla_server/_version.py @@ -15,4 +15,4 @@ # coding: utf-8 # -__version__ = "2.4.0dev0" +__version__ = "2.4.0" diff --git a/argilla/CHANGELOG.md b/argilla/CHANGELOG.md index 856fecb462..6772799b7b 100644 --- a/argilla/CHANGELOG.md +++ b/argilla/CHANGELOG.md @@ -16,6 +16,8 @@ These are the section headers that we use: ## [Unreleased]() +## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.0...v2.4.0) + ### Changed - Terms metadata properties accept other values than `str`. ([#5594](https://github.com/argilla-io/argilla/pull/5594)) diff --git a/argilla/src/argilla/_version.py b/argilla/src/argilla/_version.py index eda2d810ab..053b18b418 100644 --- a/argilla/src/argilla/_version.py +++ b/argilla/src/argilla/_version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.4.0dev0" +__version__ = "2.4.0" From 53fd1722dc91957ed326db3641ba940c7066c986 Mon Sep 17 00:00:00 2001 From: Leire Aguirre Date: Tue, 29 Oct 2024 11:08:22 +0100 Subject: [PATCH 02/23] fix and update test snaps --- .../base/base-date/base-date.test.ts | 53 +++++++++++++++++++ .../__snapshots__/BaseTableInfo.spec.js.snap | 20 +++---- .../TableFiltrableColumn.spec.js.snap | 2 +- .../SelectOptionsSearch.spec.js.snap | 2 +- 4 files changed, 65 insertions(+), 12 deletions(-) diff --git a/argilla-frontend/components/base/base-date/base-date.test.ts b/argilla-frontend/components/base/base-date/base-date.test.ts index 4c71569404..9a64dddb71 100644 --- a/argilla-frontend/components/base/base-date/base-date.test.ts +++ b/argilla-frontend/components/base/base-date/base-date.test.ts @@ -1,8 +1,16 @@ import { mount } from "@vue/test-utils"; import BaseDateVue from "./BaseDate.vue"; +import "vue-i18n"; + +const mocks = { + $i18n: { + locale: "en", + }, +}; const dateMocked = new Date("2023-07-19 00:00:00"); jest.useFakeTimers("modern").setSystemTime(dateMocked); +jest.mock("vue-i18n"); describe("Base Date should", () => { test("should format date correctly", () => { @@ -17,6 +25,11 @@ describe("Base Date should", () => { test("should format day 1 second ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-18 23:59:59").toString(), format: "date-relative-now", @@ -28,6 +41,11 @@ describe("Base Date should", () => { test("should format day 2 seconds ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-18 23:59:58").toString(), format: "date-relative-now", @@ -39,6 +57,11 @@ describe("Base Date should", () => { test("should format day 2 hours ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-18 22:00").toString(), format: "date-relative-now", @@ -50,6 +73,11 @@ describe("Base Date should", () => { test("should format day as yesterday", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-17 22:00").toString(), format: "date-relative-now", @@ -61,6 +89,11 @@ describe("Base Date should", () => { test("should format day 2 days ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-16 22:00").toString(), format: "date-relative-now", @@ -72,6 +105,11 @@ describe("Base Date should", () => { test("should format day last week", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-11 22:00").toString(), format: "date-relative-now", @@ -83,6 +121,11 @@ describe("Base Date should", () => { test("should format day 2 weeks ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-07-01 22:00").toString(), format: "date-relative-now", @@ -94,6 +137,11 @@ describe("Base Date should", () => { test("should format day last month", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-06-18 22:00").toString(), format: "date-relative-now", @@ -105,6 +153,11 @@ describe("Base Date should", () => { test("should format day 2 months ago", () => { const baseDate = mount(BaseDateVue, { + mocks: { + $i18n: { + locale: "en", + }, + }, propsData: { date: new Date("2023-05-18 22:00").toString(), format: "date-relative-now", diff --git a/argilla-frontend/components/base/base-table/__snapshots__/BaseTableInfo.spec.js.snap b/argilla-frontend/components/base/base-table/__snapshots__/BaseTableInfo.spec.js.snap index 408c589fa6..4f97888edd 100644 --- a/argilla-frontend/components/base/base-table/__snapshots__/BaseTableInfo.spec.js.snap +++ b/argilla-frontend/components/base/base-table/__snapshots__/BaseTableInfo.spec.js.snap @@ -2,22 +2,22 @@ exports[`BaseTableInfo renders properly 1`] = ` -
+
-
-
- +
+
+
-
-
    -
  • - recognai +
    +
      +
    • + recognai
      • -
    • - recognai +
    • + recognai
    diff --git a/argilla-frontend/components/base/base-table/__snapshots__/TableFiltrableColumn.spec.js.snap b/argilla-frontend/components/base/base-table/__snapshots__/TableFiltrableColumn.spec.js.snap index b46249229a..5bb68a4766 100644 --- a/argilla-frontend/components/base/base-table/__snapshots__/TableFiltrableColumn.spec.js.snap +++ b/argilla-frontend/components/base/base-table/__snapshots__/TableFiltrableColumn.spec.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`TableFiltrableColumn renders properly 1`] = ` -