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

Bump tqdm from 4.62.3 to 4.66.3 in /data/notebooks #1120

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 data/notebooks/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
python-dotenv>=0.5.1

# external tools requirements
tqdm == 4.62.3
tqdm == 4.66.3
pandas
geopandas
simpledbf
Expand Down
11 changes: 3 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
},
"dependencies": {
"@artsy/fresnel": "6.1.0",
"@deck.gl/core": "^8.9.6",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
"@dnd-kit/sortable": "^7.0.2",
Expand Down Expand Up @@ -54,6 +53,7 @@
"@turf/bbox": "6.5.0",
"@types/d3-format": "^3.0.1",
"@types/lodash-es": "4.17.7",
"autoprefixer": "^10.4.19",
"axios": "1.6.0",
"chroma-js": "^2.4.2",
"classnames": "^2.3.2",
Expand All @@ -74,6 +74,7 @@
"react-dom": "18.2.0",
"react-dropzone": "14.2.3",
"react-map-gl": "7.0.21",
"react-markdown": "^9.0.1",
"react-virtualized": "9.22.5",
"recharts": "^2.5.0",
"recoil": "^0.7.7",
Expand All @@ -88,18 +89,14 @@
},
"devDependencies": {
"@playwright/test": "^1.41.0",
"@transifex/cli": "6.0.2",
"@transifex/native": "6.0.2",
"@transifex/react": "6.0.2",
"@types/geojson": "7946.0.10",
"@types/google.analytics": "0.0.42",
"@types/mapbox-gl": "2.7.11",
"@types/node": "18.15.0",
"@types/node": "20.12.7",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"@typescript-eslint/eslint-plugin": "5.48.2",
"assert": "2.0.0",
"autoprefixer": "10.4.14",
"eslint": "8.32.0",
"eslint-config-next": "13.1.2",
"eslint-config-prettier": "8.6.0",
Expand All @@ -108,9 +105,7 @@
"prettier": "2.8.3",
"prettier-plugin-tailwindcss": "0.2.1",
"react-icons": "4.11.0",
"start-server-and-test": "1.12.1",
"svg-sprite-loader": "6.0.11",
"svgo": "3.0.2",
"svgo-loader": "3.0.3",
"typescript": "4.9.4"
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/contextual/contextual-basemaps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const BasemapsMapSettings = () => {
);

return (
<div className="relative flex flex-col text-sm text-black/85">
<RadioGroup onValueChange={handleClick} defaultValue={defaultActive}>
<div className="relative flex flex-col text-sm leading-4 text-black/85">
<RadioGroup onValueChange={handleClick} defaultValue={defaultActive} className="space-y-2">
<div className="flex space-x-4">
<RadioGroupItem
option={{ value: 'no-layer', label: 'No layer' }}
Expand Down
11 changes: 11 additions & 0 deletions src/components/markdown-viewer/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import ReactMarkdown from 'react-markdown';

function MarkdownViewer({ markdownText }) {
return (
<div className="prose prose-sm mx-auto p-4 sm:prose-lg lg:prose-xl">
<ReactMarkdown>{markdownText}</ReactMarkdown>
</div>
);
}

export default MarkdownViewer;
2 changes: 1 addition & 1 deletion src/components/radio-group/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface RadioGroupDemoProps extends RadioGroupProps {
}

const RadioGroup = ({ options, children, ...props }: RadioGroupDemoProps) => (
<RadioGroupPrimitive.Root className="space-y flex flex-col" {...props}>
<RadioGroupPrimitive.Root className="flex flex-col" {...props}>
{!!options
? options.map((option) => (
<div key={option.value}>
Expand Down
6 changes: 3 additions & 3 deletions src/components/suggested-layers/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ const SuggestedLayers = ({
// };

return (
<div className="flex flex-col space-y-4 rounded-xl bg-black bg-opacity-[4%] p-3">
<div className="flex flex-col space-y-5 rounded-xl bg-black bg-opacity-[4%] p-3">
<div className="flex items-center justify-between">
<div className="flex items-center space-x-2">
<div className="flex items-center space-x-4">
{!!thumbSource && (
<div className="relative h-[42px] w-[42px] shrink-0 rounded-2xl">
<Image
Expand All @@ -62,7 +62,7 @@ const SuggestedLayers = ({
{color && (
<div className="h-[42px] w-[42px] rounded-2xl" style={{ backgroundColor: color }} />
)}
<p className="text-sm">{description}</p>
<p className="text-sm font-light">{description}</p>
</div>
<div className="flex items-start space-x-2">
<SwitchWrapper id={id}>
Expand Down
12 changes: 5 additions & 7 deletions src/containers/datasets/alerts/widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,11 @@ const AlertsWidget = () => {
description="We recommend you to use Planet-NICFI Satellite Imagery to validate the alerts."
>
{isActive && (
<div className="pb-4">
<DateSelect
mosaic_id="45d01564-c099-42d8-b8f2-a0851accf3e7"
id="planet_medres_visual_monthly"
className={{ content: 'w-[420px]' }}
/>
</div>
<DateSelect
mosaic_id="45d01564-c099-42d8-b8f2-a0851accf3e7"
id="planet_medres_visual_monthly"
className={{ content: 'w-[420px]' }}
/>
)}
</SuggestedLayers>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/containers/datasets/drawing-tool/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ const WidgetDrawingTool = () => {
}, [setDrawingToolState, isDrawingToolEnabled, resetDrawingUploadToolState]);

useUploadFile(acceptedFiles?.[0], onUploadFile);

useEffect(() => {
setMapCursor(isDrawingToolEnabled ? 'cell' : 'grab');
}, [setMapCursor, isDrawingToolEnabled]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const IndicatorSource = ({
);

const compareNationalLayers = activeLayersIds.includes(id);

useEffect(() => {
if (isActive && !compareNationalLayers) {
const layersUpdate = updateLayers(activeLayers, {
Expand Down
3 changes: 1 addition & 2 deletions src/containers/datasets/restoration-sites/hooks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
} from 'store/widgets/restoration-sites';

import { useQuery, UseQueryOptions } from '@tanstack/react-query';
import { GeoJsonProperties, GeoJsonTypes } from 'geojson';
import { Visibility } from 'mapbox-gl';
import { useRecoilValue } from 'recoil';

Expand All @@ -19,7 +18,7 @@ import type { UseParamsOptions } from 'types/widget';

import API from 'services/api';

import type { Data, DataResponse, DataFilters, RestorationSite } from './types';
import type { Data, DataResponse, DataFilters } from './types';

// widget data
export function useMangroveRestorationSites(
Expand Down
1 change: 0 additions & 1 deletion src/containers/navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import GuideSwitcher from 'containers/guide/switcher';
import LanguageSelector from 'containers/navigation/language-selector';
import Menu from 'containers/navigation/menu';
import News from 'containers/navigation/news';

const HELPER_ID = 'menu-categories';

const AppTools = () => (
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/analysis/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export const useUploadFile = (
) => {
const [, setUploadErrorModal] = useRecoilState(uploadFileAtom);
const data = new FormData();
data.append('file', file);

data.append('file', file);
return useQuery(['converter'], () => fetchUploadFile(data), {
...queryOptions,
enabled: !!file && enabled,
Expand Down
6 changes: 4 additions & 2 deletions src/pages/500.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export default function Custom500() {
return <h1>500 - Server-side error occurred</h1>;
export default function Custom500({ statusCode }) {
return (
<h1 className="h-screen w-screen text-black">500 - Server-side error occurred {statusCode}</h1>
);
}
1 change: 0 additions & 1 deletion tests/navigation.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { expect, test } from '@playwright/test';
import { fi } from 'date-fns/locale';

test.beforeEach(async ({ page }) => {
await page.goto('/');
Expand Down
Loading
Loading