Merge branch 'develop'

JuDFTteam · Mar 18, 2019 · 2b4d269 · 2b4d269
2 parents 1b99b39 + 7a2c181
commit 2b4d269
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.3
+current_version = 1.1.5-dev
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?

diff --git a/.travis.yml b/.travis.yml
@@ -64,6 +64,6 @@ after_success:
 - codecov
 #deploy to pypi using poetry
 - cd ../../ && rm -rf aiida_kkr/tests/{submit_test/,__pycache__/,jukkr} id_rsa_travis #remove test output before publishing
-- pip install poetry && ./publish_to_pypi.sh # publish_to_pypi script does poetry publish with autentification information
+- pip install twine && ./publish_to_pypi.sh # publish_to_pypi script does not use poetry publish anymore since entrypoints are then not set correctly, use python setuy.py && twine upload instead
 git:
   depth: 3
diff --git a/aiida_kkr/__init__.py b/aiida_kkr/__init__.py
@@ -3,4 +3,4 @@
 
 """
 
-__version__ = "1.1.3"
+__version__ = "1.1.5-dev"
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [tool.poetry]
 name = "aiida-kkr"
-version = "1.1.3"
+version = "1.1.5-dev"
 description = "AiiDA plugin for the KKR code"
 authors = ["Philipp Rüssmann <[email protected]>",
            "Jens Bröder <[email protected]>",

diff --git a/secrets.tar.gz.enc b/secrets.tar.gz.enc
diff --git a/setup.json b/setup.json
@@ -14,7 +14,7 @@
         "Topic :: Scientific/Engineering :: Physics",
         "Natural Language :: English"      
     ],
-    "version": "1.1.3",
+    "version": "1.1.5-dev",
     "reentry_register": true,
     "install_requires": [
         "aiida-core == 1.0.0a4",