Skip to content

Commit

Permalink
Merge pull request #95 from ofajardo/package_data
Browse files Browse the repository at this point in the history
version 0.4.8 [skip ci]
  • Loading branch information
ofajardo authored Aug 8, 2023
2 parents c7152ff + c5ea5fa commit 71e1adc
Show file tree
Hide file tree
Showing 39 changed files with 2,636 additions and 957 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
given-names: "Otto"
orcid: "https://orcid.org/0000-0002-3363-9287"
title: "Pyreadr"
version: 0.4.7
version: 0.4.8
doi: 10.5281/zenodo.7110170
date-released: 2018-12-28
url: "https://github.com/ofajardo/pyreadr"
6 changes: 4 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ include *.pxd
recursive-include pyreadr *.pxd
include *.c
recursive-include pyreadr/libs *.c
recursive-include win_libs/64bit *.dll
recursive-include win_libs/64bit *.lib
recursive-include pyreadr *.dll
recursive-include pyreadr *.lib


2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ install:
- if "%PLATFORM%" == "x64" set CONDAPATH=%CONDAPATH%-x64
- call %CONDAPATH%\Scripts\activate
# prepare environment with conda
- conda config --add channels conda-forge
- conda config --set channel_priority strict
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# create an environment with the appropiate python
Expand Down
6 changes: 6 additions & 0 deletions change_log.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.4.8 (github, pypi and conda: 2023.08.08)
* Updated code to work with Cython 3.0.0, earlier versions no longer supported.
* Including dll files in pyreadr folder and putting them as package data for windows,
this solves issue #72. For unix no package data meaning no dll files but also no
.c translated files in the wheel.

# 0.4.7 (github, pypi and conda: 2022.09.24)
* added toml file, fixes #88
* Added Citation
Expand Down
Binary file modified docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/_build/doctrees/index.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e45368937f64630be1526f8ee1e67dd6
config: 87777a61093e61388e295f61992c1382
tags: 645f666f9bcd5a90fca523b33c5a78b7
55 changes: 26 additions & 29 deletions docs/_build/html/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -222,7 +222,7 @@ table.modindextable td {
/* -- general body styles --------------------------------------------------- */

div.body {
min-width: 450px;
min-width: 360px;
max-width: 800px;
}

Expand All @@ -237,16 +237,6 @@ a.headerlink {
visibility: hidden;
}

a.brackets:before,
span.brackets > a:before{
content: "[";
}

a.brackets:after,
span.brackets > a:after {
content: "]";
}

h1:hover > a.headerlink,
h2:hover > a.headerlink,
h3:hover > a.headerlink,
Expand Down Expand Up @@ -335,12 +325,16 @@ p.sidebar-title {
font-weight: bold;
}

nav.contents,
aside.topic,
div.admonition, div.topic, blockquote {
clear: left;
}

/* -- topics ---------------------------------------------------------------- */

nav.contents,
aside.topic,
div.topic {
border: 1px solid #ccc;
padding: 7px;
Expand Down Expand Up @@ -379,13 +373,17 @@ div.body p.centered {

div.sidebar > :last-child,
aside.sidebar > :last-child,
nav.contents > :last-child,
aside.topic > :last-child,
div.topic > :last-child,
div.admonition > :last-child {
margin-bottom: 0;
}

div.sidebar::after,
aside.sidebar::after,
nav.contents::after,
aside.topic::after,
div.topic::after,
div.admonition::after,
blockquote::after {
Expand Down Expand Up @@ -428,10 +426,6 @@ table.docutils td, table.docutils th {
border-bottom: 1px solid #aaa;
}

table.footnote td, table.footnote th {
border: 0 !important;
}

th {
text-align: left;
padding-right: 5px;
Expand Down Expand Up @@ -615,19 +609,26 @@ ul.simple p {
margin-bottom: 0;
}

dl.footnote > dt,
dl.citation > dt {
aside.footnote > span,
div.citation > span {
float: left;
margin-right: 0.5em;
}

dl.footnote > dd,
dl.citation > dd {
aside.footnote > span:last-of-type,
div.citation > span:last-of-type {
padding-right: 0.5em;
}
aside.footnote > p {
margin-left: 2em;
}
div.citation > p {
margin-left: 4em;
}
aside.footnote > p:last-of-type,
div.citation > p:last-of-type {
margin-bottom: 0em;
}

dl.footnote > dd:after,
dl.citation > dd:after {
aside.footnote > p:last-of-type:after,
div.citation > p:last-of-type:after {
content: "";
clear: both;
}
Expand All @@ -644,10 +645,6 @@ dl.field-list > dt {
padding-right: 5px;
}

dl.field-list > dt:after {
content: ":";
}

dl.field-list > dd {
padding-left: 0.5em;
margin-top: 0em;
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/_static/css/badge_only.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 71e1adc

Please sign in to comment.