Skip to content
Snippets Groups Projects
Commit 12d69c1f authored by Stefan Possanner's avatar Stefan Possanner
Browse files

Merge branch 'rm-twine' into 'master'

Remove twine

See merge request spossann/gvec_to_python!14
parents d55caee0 6c22e24f
Branches
Tags
1 merge request!14Remove twine
...@@ -26,12 +26,10 @@ default: ...@@ -26,12 +26,10 @@ default:
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
TWINE_USERNAME: __token__
TWINE_PASSWORD: pypi-AgEIcHlwaS5vcmcCJDE4YzU1YzIwLWVhY2QtNDQyZS04ODRjLTJjYTE3OTI3MDQ4YgACKlszLCI4NzYzODllYi05NWE4LTRlOTktYjg2Ny0zNDcwNDM5NjI2ZjciXQAABiD3B8VE_t8BNsezFEMcF2ZLblhgufgnrfXgCSmGuW5H4w
stages: stages:
- install_and_test - install_and_test
- release # - release
# Changes (e.g. apt install, pip install) do not persist across different GitLab CI jobs. # Changes (e.g. apt install, pip install) do not persist across different GitLab CI jobs.
# => Consolidate everything in GitLab CI into a single job, because the design is dumb. # => Consolidate everything in GitLab CI into a single job, because the design is dumb.
...@@ -73,17 +71,67 @@ install_and_test: ...@@ -73,17 +71,67 @@ install_and_test:
# release # release
deploy:
stage: release # deploy:
rules: # stage: release
- if: $CI_COMMIT_TAG # rules:
when: never # - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_REF_NAME == "master" # when: never
before_script: # - if: $CI_COMMIT_REF_NAME == "master"
- apt-get -qq update && apt-get -qq install -y gcc gfortran libblas-dev liblapack-dev libopenmpi-dev openmpi-bin # needs: ["default_build"]
- pip install -U pip build twine # script:
script: # - twine upload dist/*
- python -m build
- ls -lah dist # vars:
- twine upload dist/* # stage: release
# rules:
# - if: $CI_COMMIT_TAG
# when: never
# - if: $CI_COMMIT_REF_NAME == "master"
# before_script:
# - uname -s # get system info
# script:
# - echo "VERSION=$(var=$(<pyproject.toml); set -- $var; echo ${14} | sed 's/^.//' | sed 's/.$//')" >> vars.env
# artifacts:
# reports:
# dotenv: vars.env
# release_job:
# stage: release
# image: registry.gitlab.com/gitlab-org/release-cli:latest
# rules:
# - if: $CI_COMMIT_TAG
# when: never
# - if: $CI_COMMIT_REF_NAME == "master"
# needs: ['vars']
# before_script:
# - uname -s # get system info
# script:
# - cat /etc/*-release
# - echo $VERSION
# release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
# tag_name: 'v$VERSION' # The version is incremented per pipeline.
# name: 'v$VERSION'
# ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA.
# description: 'CHANGELOG.md'
# assets:
# links:
# - name: 'PyPI'
# url: 'https://pypi.org/project/gvec_to_python/'
# OLD, TO BE DELETED
# deploy:
# stage: release
# rules:
# - if: $CI_COMMIT_TAG
# when: never
# - if: $CI_COMMIT_REF_NAME == "master"
# before_script:
# - apt-get -qq update && apt-get -qq install -y gcc gfortran libblas-dev liblapack-dev libopenmpi-dev openmpi-bin
# - pip install -U pip build twine
# script:
# - python -m build
# - ls -lah dist
# - twine upload dist/*
## Version 1.1.2
* Move to gvec group
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
PYTHON := python3 PYTHON := python3
SO_EXT := $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))") SO_EXT := $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
LIBDIR := $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))") LIBDIR := $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
FLAGS := --libdir $(LIBDIR) FLAGS := --libdir $(LIBDIR) --conda-warnings off
#-------------------------------------- #--------------------------------------
# SOURCE FILES # SOURCE FILES
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment