Skip to content

Commit

Permalink
fix compiler flags for conda-forge; bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
virgesmith committed Nov 21, 2020
1 parent 25bea87 commit b7193a9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 17 deletions.
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ src/**/*.so

.vscode*/
build/
node_modules/

# binaries
neworder
neworder_mpi
testharness
testharness_mpi

# data
dm*.csv
Expand All @@ -38,5 +31,3 @@ dist/*

*_old*

# eval
docs/_build/
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
0.1.2
10 changes: 5 additions & 5 deletions docs/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ Merge branches/PRs into master and fix any CI issues (builds, tests, major code
5. Tag: `git tag -a $(cat VERSION) -m"release v$(cat VERSION)"`
6. Push, including tag: `git push --atomic origin master $(cat VERSION)`
7. Check tagged CI builds and docker image are ok
8. Create release on github, using release notes from above
9. Check zenodo for new DOI
10. Package and upload to PyPI: `scripts/package.sh`
11. Update conda feedstock, see instructions [here](https://github.com/conda-forge/neworder-feedstock)
12. Install pypi/conda-forge/docker releases in a fresh environment and ensure all is well
8. Check zenodo for new DOI
9. Package and upload to PyPI: `scripts/package.sh`
10. Update conda feedstock, see instructions [here](https://github.com/conda-forge/neworder-feedstock)
11. Install pypi/conda-forge/docker releases in a fresh environment and ensure all is well. If not, fix and go back to 2.
12. Create release on github, using the tag and the release notes from above
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ def cxxflags(platform):
if platform == "unix":
return [
"-Wall",
"-Werror",
"-pedantic",
"-pthread",
"-Wsign-compare",
Expand Down Expand Up @@ -109,7 +108,7 @@ def build_extensions(self):

for ext in self.extensions:
print(self.distribution.get_version())
ext.define_macros = defines(ct) #[('NEWORDER_VERSION', self.distribution.get_version())]
ext.define_macros = defines(ct)
ext.extra_compile_args = cxxflags(ct)
ext.extra_link_args = ldflags(ct)

Expand Down

0 comments on commit b7193a9

Please sign in to comment.