Skip to content

Commit

Permalink
Merge 122e918 into c4c292f
Browse files Browse the repository at this point in the history
  • Loading branch information
lnielsen committed Nov 2, 2015
2 parents c4c292f + 122e918 commit 3010445
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 15 deletions.
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ cache:
- pip

env:
# Disabled until dependent packages have been released:
# - REQUIREMENTS=lowest
# - REQUIREMENTS=release
- REQUIREMENTS=lowest
- REQUIREMENTS=release
- REQUIREMENTS=devel

python:
Expand All @@ -61,3 +60,14 @@ script:

after_success:
- coveralls

deploy:
provider: pypi
user: lnielsen
password:
secure: VR963pGTKJlFMhiQq/eerCDfciJeEKxxWlBK5qsnnVssxwoBwjGeiWABf/U/4il/64TgmShauc1g2GPGYNgZvdZXuOtPRW5rLMEU8lDb1KSe0kpJnPgj7NAMVKbLPYF7orBY8eU1UKvP3t2rWqLBpGJ5k2ia+Hrtp3Ki3u0gAeI=
distributions: "compile_catalog sdist bdist_wheel"
on:
tags: true
python: "2.7"
condition: $REQUIREMENTS = release
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Here is a summary of the most notable changes in Invenio
releases. For more information about the current release, please
consult RELEASE-NOTES for each individual release.

Invenio v3.0.0 -- released 2015-10-30
-------------------------------------

Invenio v2.1.1 -- released 2015-09-01
-------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Invenio v3.0.0
================

Invenio v3.0.0 was released on TBD, 2016.
Invenio v3.0.0 was released on October 30, 2015.

About
-----
Expand Down
2 changes: 1 addition & 1 deletion invenio/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@

from __future__ import absolute_import, print_function

__version__ = "3.0.0.dev20150000"
__version__ = "3.0.0a1"
27 changes: 17 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,24 @@
]

extras_require = {
'accounts': [
'invenio-accounts>=1.0.0a1,<1.1.0',
],
'records': [
'invenio-pidstore>=1.0.0a1,<1.1.0',
'invenio-records>=1.0.0a2,<1.1.0',
'invenio-records-ui>=1.0.0a1,<1.1.0',
'invenio-records-rest>=1.0.0a2,<1.1.0',
],
'theme': [
'invenio-assets>=1.0.0a1,<1.1.0',
'invenio-theme>=1.0.0a1,<1.1.0',
],
'accounts': [
'invenio-accounts>=1.0.0.dev20150000,<1.1.0',
'invenio-theme>=1.0.0a3,<1.1.0',
],
'utils': [
'invenio-mail>=1.0.0a1,<1.1.0',
'invenio-db>=1.0.0a1,<1.1.0',
'invenio-db>=1.0.0a5,<1.1.0',
'invenio-rest>=1.0.0a2,<1.1.0',
'invenio-logging>=1.0.0a1,<1.1.0',
],
'docs': [
'Sphinx>=1.3',
Expand All @@ -68,8 +76,7 @@
#
aliases = {
'minimal': ['accounts', 'theme', 'utils', ],
'repository': ['accounts', 'theme', 'utils', ],
'oaisstore': [],
'full': ['accounts', 'records', 'theme', 'utils', ],
}

for name, requires in aliases.items():
Expand All @@ -91,8 +98,8 @@
]

install_requires = [
'invenio-base>=1.0.0.dev20150000,<1.1.0',
'invenio-celery>=1.0.0.dev20150000,<1.1.0',
'invenio-base>=1.0.0a2,<1.1.0',
'invenio-celery>=1.0.0a1,<1.1.0',
'invenio-config>=1.0.0a1,<1.1.0',
'invenio-i18n>=1.0.0a1,<1.1.0',
]
Expand Down Expand Up @@ -172,7 +179,7 @@ def run_tests(self):
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Development Status :: 1 - Planning',
'Development Status :: 3 - Alpha',
],
cmdclass={'test': PyTest},
)

0 comments on commit 3010445

Please sign in to comment.