Skip to content
Snippets Groups Projects
Commit c7205b44 authored by Benedikt's avatar Benedikt
Browse files

changed to dsiUnit pacakge from pip instead of local one

parent e6d07173
No related branches found
No related tags found
No related merge requests found
venv/
.idea/
.vscode/
......@@ -3,15 +3,15 @@ FROM python:3.11
# WORKDIR /usr/src/app
ENV GIT_SSL_NO_VERIFY=1
# Set the environment variable for the HTTP proxy
ENV http_proxy="http://webproxy.bs.ptb.de:8080"
ENV https_proxy="http://webproxy.bs.ptb.de:8080"
#ENV http_proxy="http://webproxy.bs.ptb.de:8080"
#ENV https_proxy="http://webproxy.bs.ptb.de:8080"
# Set the environment variable for the NO_PROXY
# This ensures that the proxy is not used for ptb.de
ENV no_proxy="ptb.de"
#ENV no_proxy="ptb.de"
# Install any needed packages specified in requirements.txt
RUN git clone https://dockerPull:Fu7bxBnYeyhq8Xz8seHS@gitlab1.ptb.de/digitaldynamicmeasurement/dsi-parser-frontend
RUN git clone https://gitlab1.ptb.de/digitaldynamicmeasurement/dsi-parser-frontend.git
#RUN pip install --proxy=webproxy.bs.ptb.de:8080 --no-cache-dir -r dsi-parser-frontend/requirements.txt
......
......@@ -7,7 +7,7 @@ import itertools
import math
import bokehCssPTB
from urllib.parse import quote
from dsiParser import dsiParser,format_special_scale_factor
from dsiUnits import dsiUnit
from bokeh.plotting import curdoc,figure
from bokeh.layouts import column, row
from bokeh.models import FileInput, Div, CustomJS, Button, TabPanel, Tabs, Dropdown, TextInput, Button, MathText, Label, Arrow, NormalHead,CheckboxGroup
......@@ -63,8 +63,7 @@ class dsiparserInput():
def parseInput(self):
self.results.children = []
input = self.dsiInput.value
p = dsiParser()
resultTree = p.parse(input)
resultTree = dsiUnit(input)
parsingMessages = []
if resultTree.valid:
......
bokeh~=3.3.2
-e git+https://dockerPull:-jVp9LBaxeKp9HKAe9dw@gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB
-e git+https://dockerPull:pYngV-zkWjSXmve9yEpx@gitlab1.ptb.de/digitaldynamicmeasurement/python_dsi_latex_converter.git@release#egg=dsiParser
#-e git+https://dockerPull:-jVp9LBaxeKp9HKAe9dw@gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB
-e git+https://gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB
dsiUnits~=2.2.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment