|
26 | 26 | "name": "stdout", |
27 | 27 | "output_type": "stream", |
28 | 28 | "text": [ |
29 | | -<<<<<<< Updated upstream |
30 | | - "Obtaining file:///Users/krishna/dev/DesignSafe/dapi\n", |
31 | | - " Installing build dependencies ... \u001b[?25ldone\n", |
32 | | - "\u001b[?25h Checking if build backend supports build_editable ... \u001b[?25ldone\n", |
33 | | - "\u001b[?25h Getting requirements to build editable ... \u001b[?25ldone\n", |
34 | | - "\u001b[?25h Preparing editable metadata (pyproject.toml) ... \u001b[?25ldone\n", |
35 | | - "\u001b[?25hRequirement already satisfied: exceptiongroup<2.0.0,>=1.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.3.0)\n", |
36 | | - "Requirement already satisfied: griffe<2.0.0,>=1.7.3 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.7.3)\n", |
37 | | - "Requirement already satisfied: jsonschema<5.0.0,>=4.24.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (4.24.0)\n", |
38 | | - "Requirement already satisfied: mkdocs<2.0.0,>=1.6.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.6.1)\n", |
39 | | - "Requirement already satisfied: mkdocs-autorefs<2.0.0,>=1.4.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.4.2)\n", |
40 | | - "Requirement already satisfied: mkdocs-material<10.0.0,>=9.6.14 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (9.6.14)\n", |
41 | | - "Requirement already satisfied: mkdocstrings<0.30.0,>=0.29.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (0.29.1)\n", |
42 | | - "Requirement already satisfied: numpy<2.1.0,>=1.21.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.0.2)\n", |
43 | | - "Requirement already satisfied: pandas<3.0.0,>=1.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.3.0)\n", |
44 | | - "Requirement already satisfied: pymysql<2.0.0,>=1.1.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.1.1)\n", |
45 | | - "Requirement already satisfied: python-dotenv<2.0.0,>=1.1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.1.0)\n", |
46 | | - "Requirement already satisfied: sqlalchemy<3.0.0,>=2.0.41 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.0.41)\n", |
47 | | - "Requirement already satisfied: tapipy<2.0.0,>=1.8.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.8.4)\n", |
48 | | - "Requirement already satisfied: tomli>=1.1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.2.1)\n", |
49 | | - "Requirement already satisfied: tqdm<5.0.0,>=4.67.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (4.67.1)\n", |
50 | | - "Requirement already satisfied: typing-extensions>=4.6.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from exceptiongroup<2.0.0,>=1.3.0->dapi==0.4.2) (4.14.0)\n", |
51 | | - "Requirement already satisfied: colorama>=0.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from griffe<2.0.0,>=1.7.3->dapi==0.4.2) (0.4.6)\n", |
52 | | - "Requirement already satisfied: attrs>=22.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (25.3.0)\n", |
53 | | - "Requirement already satisfied: jsonschema-specifications>=2023.03.6 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (2025.4.1)\n", |
54 | | - "Requirement already satisfied: referencing>=0.28.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (0.36.2)\n", |
55 | | - "Requirement already satisfied: rpds-py>=0.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (0.25.1)\n", |
56 | | - "Requirement already satisfied: click>=7.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (8.1.8)\n", |
57 | | - "Requirement already satisfied: ghp-import>=1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (2.1.0)\n", |
58 | | - "Requirement already satisfied: importlib-metadata>=4.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (8.7.0)\n", |
59 | | - "Requirement already satisfied: jinja2>=2.11.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.1.6)\n", |
60 | | - "Requirement already satisfied: markdown>=3.3.6 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.8)\n", |
61 | | - "Requirement already satisfied: markupsafe>=2.0.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.0.2)\n", |
62 | | - "Requirement already satisfied: mergedeep>=1.3.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (1.3.4)\n", |
63 | | - "Requirement already satisfied: mkdocs-get-deps>=0.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (0.2.0)\n", |
64 | | - "Requirement already satisfied: packaging>=20.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (25.0)\n", |
65 | | - "Requirement already satisfied: pathspec>=0.11.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (0.12.1)\n", |
66 | | - "Requirement already satisfied: pyyaml-env-tag>=0.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (1.1)\n", |
67 | | - "Requirement already satisfied: pyyaml>=5.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (6.0.2)\n", |
68 | | - "Requirement already satisfied: watchdog>=2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (6.0.0)\n", |
69 | | - "Requirement already satisfied: babel~=2.10 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.17.0)\n", |
70 | | - "Requirement already satisfied: backrefs~=5.7.post1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (5.8)\n", |
71 | | - "Requirement already satisfied: mkdocs-material-extensions~=1.3 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (1.3.1)\n", |
72 | | - "Requirement already satisfied: paginate~=0.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (0.5.7)\n", |
73 | | - "Requirement already satisfied: pygments~=2.16 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.19.1)\n", |
74 | | - "Requirement already satisfied: pymdown-extensions~=10.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (10.15)\n", |
75 | | - "Requirement already satisfied: requests~=2.26 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.32.4)\n", |
76 | | - "Requirement already satisfied: python-dateutil>=2.8.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2.9.0.post0)\n", |
77 | | - "Requirement already satisfied: pytz>=2020.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2025.2)\n", |
78 | | - "Requirement already satisfied: tzdata>=2022.7 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2025.2)\n", |
79 | | - "Requirement already satisfied: PyJWT>=1.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2.10.1)\n", |
80 | | - "Requirement already satisfied: atomicwrites<2.0.0,>=1.4.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.4.1)\n", |
81 | | - "Requirement already satisfied: certifi>=2020.11.8 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2025.4.26)\n", |
82 | | - "Requirement already satisfied: cloudpickle>=1.6.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (3.1.1)\n", |
83 | | - "Requirement already satisfied: cryptography>=3.3.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (45.0.4)\n", |
84 | | - "Requirement already satisfied: openapi_core==0.16.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.16.0)\n", |
85 | | - "Requirement already satisfied: openapi_spec_validator<0.6.0,>=0.5.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.5.4)\n", |
86 | | - "Requirement already satisfied: setuptools>=21.0.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (80.9.0)\n", |
87 | | - "Requirement already satisfied: six<2.0,>=1.10 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.17.0)\n", |
88 | | - "Requirement already satisfied: urllib3<2.0.0,>=1.26.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.26.20)\n", |
89 | | - "Requirement already satisfied: isodate in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.7.2)\n", |
90 | | - "Requirement already satisfied: jsonschema-spec<0.2.0,>=0.1.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.1.3)\n", |
91 | | - "Requirement already satisfied: more-itertools in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (10.7.0)\n", |
92 | | - "Requirement already satisfied: openapi-schema-validator<0.4.0,>=0.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.3.4)\n", |
93 | | - "Requirement already satisfied: parse in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.20.2)\n", |
94 | | - "Requirement already satisfied: pathable<0.5.0,>=0.4.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.4.4)\n", |
95 | | - "Requirement already satisfied: werkzeug in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (3.1.3)\n", |
96 | | - "Requirement already satisfied: cffi>=1.14 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from cryptography>=3.3.2->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.17.1)\n", |
97 | | - "Requirement already satisfied: zipp>=3.20 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from importlib-metadata>=4.4->mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.23.0)\n", |
98 | | - "Requirement already satisfied: platformdirs>=2.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-get-deps>=0.2.0->mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (4.3.8)\n", |
99 | | - "Requirement already satisfied: lazy-object-proxy<2.0.0,>=1.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_spec_validator<0.6.0,>=0.5.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.11.0)\n", |
100 | | - "Requirement already satisfied: charset_normalizer<4,>=2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from requests~=2.26->mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (3.4.2)\n", |
101 | | - "Requirement already satisfied: idna<4,>=2.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from requests~=2.26->mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (3.10)\n", |
102 | | - "Requirement already satisfied: pycparser in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from cffi>=1.14->cryptography>=3.3.2->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2.22)\n", |
103 | | - "Building wheels for collected packages: dapi\n", |
104 | | - " Building editable for dapi (pyproject.toml) ... \u001b[?25ldone\n", |
105 | | - "\u001b[?25h Created wheel for dapi: filename=dapi-0.4.2-py3-none-any.whl size=4067 sha256=45bb3f8236d06942da898366513f474a9fb0ab9f06eb242733edea6f7e97331f\n", |
106 | | - " Stored in directory: /private/var/folders/w8/xz590jyd7r36zmxcspgzj3z40000gn/T/pip-ephem-wheel-cache-bbokgmyb/wheels/4c/51/46/2eb544e5cdddc745a3f608890dcac74e54c3ba4a42b4993717\n", |
107 | | - "Successfully built dapi\n", |
108 | | - "Installing collected packages: dapi\n", |
109 | | - " Attempting uninstall: dapi\n", |
110 | | - " Found existing installation: dapi 0.4.2\n", |
111 | | - " Uninstalling dapi-0.4.2:\n", |
112 | | - " Successfully uninstalled dapi-0.4.2\n", |
113 | | - "Successfully installed dapi-0.4.2\n", |
114 | | - "\n", |
115 | | -======= |
116 | 29 | "\u001b[31mERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.\n", |
117 | 30 | "poetry 2.1.3 requires importlib-metadata<8.7,>=4.4; python_version < \"3.10\", but you have importlib-metadata 8.7.0 which is incompatible.\u001b[0m\u001b[31m\n", |
118 | 31 | "\u001b[0m\n", |
119 | | ->>>>>>> Stashed changes |
120 | 32 | "\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m24.2\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m25.1.1\u001b[0m\n", |
121 | 33 | "\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n" |
122 | 34 | ] |
123 | 35 | } |
124 | 36 | ], |
125 | 37 | "source": [ |
126 | | -<<<<<<< Updated upstream |
127 | | - "# Dapi installation\n", |
128 | | - "#!pip uninstall dapi --yes\n", |
129 | | - "\n", |
130 | | - "#!pip install dapi --user --quiet\n", |
131 | | - "\n", |
132 | | - "# Install the latest development version of dapi from GitHub\n", |
133 | | - "!pip install git+https://github.com/DesignSafe-CI/dapi.git@dev --user --quiet\n", |
134 | | - "\n", |
135 | | - "# Install editable local version of dapi\n", |
136 | | - "#!pip install -e ../../" |
137 | | -======= |
138 | | - "!pip install --upgrade --ignore-installed --no-cache-dir --user --quiet dapi" |
| 38 | + "!pip install --upgrade --ignore-installed --no-cache-dir --user --quiet --no-warn-script-location dapi" |
139 | 39 | ] |
140 | 40 | }, |
141 | 41 | { |
|
163 | 63 | "metadata": {}, |
164 | 64 | "source": [ |
165 | 65 | "### ⚠️ Please restart the kernel by choosing Kernel >> Restart kernel ⚠️" |
166 | | ->>>>>>> Stashed changes |
167 | 66 | ] |
168 | 67 | }, |
169 | 68 | { |
|
208 | 107 | ] |
209 | 108 | }, |
210 | 109 | { |
211 | | -<<<<<<< Updated upstream |
212 | | -======= |
213 | 110 | "cell_type": "markdown", |
214 | 111 | "id": "e4ac6312", |
215 | 112 | "metadata": {}, |
|
218 | 115 | ] |
219 | 116 | }, |
220 | 117 | { |
221 | | ->>>>>>> Stashed changes |
222 | 118 | "cell_type": "code", |
223 | 119 | "execution_count": null, |
224 | 120 | "id": "feee3ce0", |
|
0 commit comments