Skip to content

Commit

Permalink
Merge pull request #113 from gisaia/feat/server24.1.1
Browse files Browse the repository at this point in the history
Upgrade dependencies (server 24.1.1)
  • Loading branch information
alainbodiguel authored Feb 14, 2024
2 parents 0c7fe7b + 2e86551 commit 3dd41b8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<surefire.version>2.22.2</surefire.version>
<log4j.version>2.19.0</log4j.version>

<arlas-server.version>24.1.0</arlas-server.version>
<arlas-server.version>24.1.1</arlas-server.version>
<!-- KAFKA-->
<kafka.version>3.6.1</kafka.version>

Expand Down
33 changes: 0 additions & 33 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,16 +233,6 @@ else
gisaia/swagger-codegen-2.3.1 \
-l typescript-fetch --additional-properties modelPropertyNaming=snake_case

mkdir -p target/tmp/python-api
docker run --rm \
-e GROUP_ID="$(id -g)" \
-e USER_ID="$(id -u)" \
--mount dst=/input/api.json,src="$PWD/target/tmp/swagger.json",type=bind,ro \
--mount dst=/input/config.json,src="$PROJECT_ROOT_DIRECTORY/conf/swagger/python-config.json",type=bind,ro \
--mount dst=/output,src="$PWD/target/tmp/python-api",type=bind \
gisaia/swagger-codegen-2.2.3 \
-l python --type-mappings GeoJsonObject=object

echo "=> Build Typescript API "${FULL_API_VERSION}
cd ${BASEDIR}/target/tmp/typescript-fetch/
cp ${BASEDIR}/conf/npm/package-build.json package.json
Expand All @@ -263,29 +253,6 @@ else
npm publish || echo "Publishing on npm failed ... continue ..."
else echo "=> Skip npm api publish"; fi


echo "=> Build Python API "${FULL_API_VERSION}
cd ${BASEDIR}/target/tmp/python-api/
cp ${BASEDIR}/conf/python/setup.py setup.py
sed -i.bak 's/\"api_tagger_version\"/\"'${FULL_API_VERSION}'\"/' setup.py

docker run \
-e GROUP_ID="$(id -g)" \
-e USER_ID="$(id -u)" \
--mount dst=/opt/python,src="$PWD",type=bind \
--rm \
gisaia/python-3-alpine \
setup.py sdist bdist_wheel

echo "=> Publish Python API "
if [ "$RELEASE" == "YES" ]; then
docker run --rm \
-w /opt/python \
-v $PWD:/opt/python \
python:3 \
/bin/bash -c "pip install twine ; twine upload dist/* -u ${PIP_LOGIN} -p ${PIP_PASSWORD}"
### At this stage username and password of Pypi repository should be set
else echo "=> Skip python api publish"; fi
fi

cd ${BASEDIR}
Expand Down

0 comments on commit 3dd41b8

Please sign in to comment.