Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into libraries
Browse files Browse the repository at this point in the history
# Conflicts:
#	HISTORY.rst
#	evolved5g/nef_and_tsn_api_service_validation_pipeline.py
#	setup.cfg
#	setup.py
  • Loading branch information
AlexJoom committed Sep 14, 2023
2 parents bc56500 + 502c8ce commit 81b0e82
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Build and Upload to pypi
run: |
python3 setup.py sdist bdist_wheel
python3 -m twine upload dist/*
python3 -m twine upload dist/* --verbose
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
History
=======

-------------------
1.0.11 (2023-09-12)
-------------------
* Bug fix on validation pipeline. Take into account that domainName may not be present in the service description (aefProfile)
* Requirements file has been updated to remove package conflicts. Also, deploy yaml has been updated for better debugging issues.

-------------------
1.0.12 (2023-09-14)
-------------------
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ watchdog==0.9.0
flake8==3.9.2
coverage==4.5.4
Click==8.0.1
pytest==6.2.4
pytest
cookiecutter==2.1.1
invoke==1.6.0
requests==2.26.0
Expand All @@ -12,3 +12,4 @@ certifi~=2021.10.8
urllib3~=1.26.7
typing-extensions==3.10.0.2
pyopenssl==22.1.0

5 changes: 3 additions & 2 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ watchdog==0.9.0
flake8==3.9.2
tox
coverage==4.5.4
Sphinx==1.8.5
Sphinx
twine
Click==8.0.1
pytest==6.2.4
pytest
cookiecutter==2.1.1
invoke==1.6.0
requests==2.26.0
build

0 comments on commit 81b0e82

Please sign in to comment.