diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml deleted file mode 100644 index 1cc5397..0000000 --- a/.github/workflows/CICD.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: CICD - -on: - push: - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - name: Test - run: | - pip install pytest pytest-xprocess - pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pip install -e . - pytest - - build: - runs-on: ubuntu-latest - needs: test - if: github.ref == 'refs/heads/next' || github.ref == 'refs/heads/master' - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.TOKEN }} - - name: Python Semantic Release - uses: python-semantic-release/python-semantic-release@master - id: semantic-release - with: - github_token: ${{ secrets.TOKEN }} - - name: Build - run: | - python3 -m pip install --upgrade build - python3 -m build - - name: Upload PYPI - if: steps.semantic-release.outputs.released == 'true' - run: | - python3 -m pip install twine==6.0.1 - python3 -m twine upload --repository pypi dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} - - name: Setup NODE - uses: actions/setup-node@v3 - with: - registry-url: "https://registry.npmjs.org" - node-version: "20.x" - - name: Upload NPM - if: steps.semantic-release.outputs.released == 'true' - run: | - pwd - cd ${{ github.workspace }} - npm i - npm run json - jq '.version="${{steps.semantic-release.outputs.version}}"' package.json > temp && mv temp package.json - cat package.json - npm publish - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Merge master -> next - if: github.ref == 'refs/heads/master' - uses: devmasx/merge-branch@master - with: - type: now - from_branch: master - target_branch: next - github_token: ${{ secrets.TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 35ffc1c..7d6699d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,4 +9,3 @@ jobs: with: npm: true secrets: inherit - \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e819317..c8cca2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,4 +11,5 @@ jobs: uses: Geode-solutions/actions/.github/workflows/py-test.yml@master with: repos: ${{ vars.REPOS }} + npm: true secrets: inherit diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml index 177cb91..464546f 100644 --- a/.github/workflows/test_pr.yml +++ b/.github/workflows/test_pr.yml @@ -9,4 +9,5 @@ jobs: uses: Geode-solutions/actions/.github/workflows/py-test-pr.yml@master with: repos: ${{ vars.REPOS }} + npm: true secrets: inherit diff --git a/package.json b/package.json index 4c9eb7a..81084e5 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,11 @@ "name": "@geode/opengeodeweb-viewer", "scripts": { "json": "node ./node_modules/@geode/opengeodeweb-back/generate_schemas.js opengeodeweb_viewer rpc rpc .", - "test": "npm run json && pytest" + "test": "npm run json", + "build": "npm run json" }, "dependencies": { - "@geode/opengeodeweb-back": "5.8.6" + "@geode/opengeodeweb-back": "latest" }, "exports": { "./opengeodeweb_viewer_schemas.json": { @@ -13,7 +14,7 @@ "require": "./opengodeweb_viewer_schemas.json" } }, - "version": "0.0.0-semantically-released", + "version": "0.0.0", "description": "", "main": "generate_schemas.js", "repository": { @@ -36,4 +37,4 @@ "files": [ "opengeodeweb_viewer_schemas.json" ] -} +} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 3ca2678..e04df9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,14 +5,14 @@ build-backend = "setuptools.build_meta" [project] name = "OpenGeodeWeb-Viewer" -version = "1.10.1" +version = "0.0.0" dynamic = ["dependencies"] authors = [ { name="Geode-solutions", email="team-web@geode-solutions.com" }, ] description = "OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", @@ -51,18 +51,3 @@ where = ["src"] "opengeodeweb_viewer.rpc.model.surfaces.schemas" = ["*.json"] "opengeodeweb_viewer.rpc.model.blocks.schemas" = ["*.json"] "opengeodeweb_viewer.rpc.viewer.schemas" = ["*.json"] - -[tool.semantic_release] -version_toml = [ - "pyproject.toml:project.version", -] - -[tool.semantic_release.remote.token] -env = "GH_TOKEN" - -[tool.semantic_release.branches.master] -match = "master" - -[tool.semantic_release.branches.next] -match = "next" -prerelease = true